Fixup form changing @nodeset into @ref, fix #1133