Generics are somewhat improved, but still much work to do.  May require some fundamental changes.