Java-6-ify. Relates to #1