Various classes in an anonymous namespace were being instantiated
in the wrong namespace. They don't need to be explicitly instantiated at all.
Fix compiler warning: multiple unsequenced modifications
Respond to review by removing unwanted semicolon and line continuation
Merge branch 'tickets/DM-1302'