Get rid of some duplication in SpaceAroundBlockBraces.

The rewritten 'SpaceAroundBlockBraces` got a C in Code Climate. Try to improve matters.