Making code compatible with javac 1.5.