WIP simplify booleanhint, no * AND
some whitespace cleanup