Merge "A few more Java7 related clean ups."