Add back guard clause for arity 0...makes a difference after all.