Require/Disallow space before keywords

This is for #553 (old PR was #555)