Eliminate unecessary passdown of class constant

Clean up from an old pull request that was never merged.  No ticket for this PR.