Fix up p-wrap handler priorities; add rank to returned tokens

* This had always been missing because at the time this code
  was being worked one, we had bugs in the TokenTransformManager
  which was not honoring ranks properly and the paragraph-wrapper
  was written to work without it.

* In anticipation of cleanup, and now that those original bugs have
  been squashed, fixed up handler priorities and added ranks to
  returned tokens to ensure that at most only one handler gets
  their hand on them.

* No change in parser tests (as it should be).

Change-Id: I8c0ef447ce24b241287ea0fc150148a0ecd1e72d