fix whitespace removal around expressions