stop returning move(...) when unnecessary