stop hanging onto ModuleVisitors!
various attempts to optimize the model