Comments and tweaked for JVM 1.6 compliance.