streamline Modes::DSL a little
Extract Modality DSL stuff to Modality::DSL