am 47d79fd3: Merge "Clean up usage of carry flag condition codes."

* commit '47d79fd31295b29e4abeb6d3fc318e6a6dd1e97c':
  Clean up usage of carry flag condition codes.