Collections.emptyIterator is not present in jdk6. Fix some minor checkstyle warnings