Lose extraneous {}
Appease the fickle lint gods
Appease std::move declarations for CLANG
Merge branch 'gchpaco_compile_fix' into next
Merge branch 'gchpaco_2898' into next
Merge branch 'next' into sam_2156