JAL-1421 generics used for leaner safer code