More basic Java 5-ifications.