Minor coverity defects: use std::move where possible, detected 22 July 2024. Tidied headers while there.