make shadow reference fix handle plain expressions