Switched to new divrem32 macro and did some minor housekeeping.