Fix register usage around CmpMapAndBranch