Be more consistent about style and copyright headers.

I'm not particular, but javawriter's checkstyle bombs on this. Your call.