Compat Java 1.5+ (again)