Skins2: Use typedefs for internal template-derived types, and rectify an accidental skip while removing.