Cleanup improper usages of std::move