Be more consistent about style and copyright headers.