Fix constant highlighting in AVM mode