Fixup for core removal of GeometryType and ShaderSubTypes