[FORGE-1836] Refactor towards JDK 1.7 enhancements