Fixing per Chuck's suggestion. This should've made it into the previous commit, but I forgot to push, and have already merged. Ah well.
Merge pull request #1021 from afred/refactor-description-document-wrapper

Fixing per Chuck's suggestion. This should've made it into the previous ...