Merge "Use CompareAndBranchIf(Non)Zero when applicable."