Simplify code so it will build under Java 8.