Remove unnecessary whitespace from expressions

This isn't working correctly.