Changes when switching to Java7.