Gerrit: Update spacing and other small changes.