Awtt 21 simplify use of generics