Fix up some wrapping errors I noticed right after submitting the PR with these
changes in it.