Removed a few boost::move()s. Prefer elisions to moves