Core: Fixed id_to_unit{_mut,_opt}