various cleanups

[lefticus]

Various cleanups for efficiency, including removing use of std::move, see notes. The use of std::move you had was actually causing the code to be potentially slower and was at the very least unnecessary.