Tidy up move methods.