MDL-43089 Bye bye 150 lines of structure code.