Added more support for new AstValue/Ref types