So I'm assuming from the context that "butch" and "femme" here were originally tachi and neko?