Move divrem fixup into macro.