Fixes #3464 : replace use of ifvarclass for simple class expression
Merge pull request #88 from ncharles/ust_3463/dev/3464_replace_use_of_ifvarclass

Fixes #3464 : replace use of ifvarclass for simple class expression
Merging 2.3 into 2.4