Update to compile against Java 7.