Further streamlined. Java7, ftw.