Remove java 7 specific generics.