Refactor addr-line named-content conversion to work with two nested tag types.
Start on edge case conversion of text to contrib role tags.
Role edge cases completed.