Revert "[clang] use getCommonSugar in an assortment of places"

This reverts commit aff1f6310e5f4cea92c4504853d5fd824754a74f.

GitOrigin-RevId: 1d1a98e9a06ed7a9289b2fd7925035dbcbb7e0ce
6 files changed