Remove code that uses Java 7-specific syntax to address issue #48.

Remove code that uses Java 7-specific syntax to address issue #48.