cmFunctionBlocker: Move check for matching args
9 files changed