Move some entities
Make rw_of_string to return `ident instead of `none