fixup hyperlinking in Unpromoted haddock
slight code reorg in Unpromoted