Various clean ups
Support for mls true or false statement