Add auto-correct support for WhenThen