Checkstyle fixes to adhere to the new license text.