Fix member subclasses, clean up member logic