Tidy up Modules/Events/Parameters class lookup system