Work on relaxing unnecessary generics type restrictions