Make a few internal classes part of yp2 ns