Generics moved to where they belong, Expressions removed