Now I again improve by reverting to the old BuildDocumentVisitor
implementation. A fresh start...