Updated to target Java 7.