More Type instantiation fixes for rc.cup