Revert "Leave a blank line after control structures"

This reverts commit 31607fba0c4d52477ce24909e0d2758d39a71db9.
Add a more general guideline about vertical whitespace