Merge "Follow up of "div/rem on x86 and x86_64", to tidy up the code a little."