Started work on expanding qnames inside literals