Fixup function constant classes
Lint cleanup