Fixing bug where annotations where not printed on constructors and nodes.
Merge remote-tracking branch 'origin' into persistent-set-case-distinction