larger refactoring of doctags implementation, part 2 ? WORK IN PROGRESS !