Removing more Javaisms