Require/Disallow space before keywords

This is for #553 (old PR was #555)
Awesome! But could you move it to different commit?