Be more consistent about style and copyright headers.

Neither version is a style violation, so let's just go with the one that's easy for checkstyle.