This sp_cond_ternary_short should be in a separate pull request.  I would have pulled that in alone, but I don't really want to pull it in as part of the objective C indent changes.