AT-37: Making the code java 6 compliant via the java 7 compiler.