More arity fixes.