Doctools changes, trying an additional wrapper.