Oh thank you for this, that's fantastic. Still some edge cases (thread expansion seems odd?) but just having it as an option is great.