Completing the migration to Java6