Goodbye Java 5! Fixes #536