Improve handling comments for *SpaceAfterKeywords

Fixes #397