Merge "Clean up usage of carry flag condition codes."