add cases to cover class/constant lookups that were causing issues