Added support for dropping expressions on math values