Changes to handling of scalar functions.
Changes to handling of scalar functions.

copperhead/copperhead,shyamalschandra/copperhead,shyamalschandra/copperhead,beni55/copperhead,beni55/copperhead,copperhead/copperhead