Add Disabled modifier and fix Maybe's behavior to revert to default, not
to disabled