Avoid passing args to CLI handlers when none are needed, fixes #3332