Introduce AstLabelled and AstUnlabelled

(and fix bug in pretty-printer which was using the label for a Comp as its type)