Small fixes in boolean expression formatting