Convert remaining 'eval "use $class"' statements to use ModuleLoader
Merge branch 'veryrusty-Pr/housekeeping' into devel