Fix a FIXME, use std::move.