Remove expectedNumArgs (#4441)