jdk

d5e575fc - Minor lint-related cleanups.