Extend use of tags
Work around Cabal issues