Correctly distinguish between functions and constants

So far 'use function' applied to both constants and functions. This
patch correctly separates the two.