I think if you go with one-class-instance per file this is no longer needed