MDL-43089 more structure simplification.
MDL-43089 another 100 lines of code gone.