More consistency between function and var