Add support for variables of higher arity.