Removing encloseAsTag... we don't absolutely need this now, and we couldn't remove it as its public.