Made declarative handler distinguish literals from refrences