Restore Java 1.6 compatibility; squelch an ant warning