Couple of changes mainly for arity-0 functions.