Re-add some docblock-tag namespace fixes that got lost due to rebasing