Leave spaces around operators that would be ambiguous without them

Fixes #514