qdoc: retrying More refactoring of qdoc data structures