Small cleanup, use remap instead.