Previously, we looked through synonyms when counting arguments,
but that's a bit silly.

(cherry picked from commit a6152159)