Revert "Do all of Cite's real work during unstrip" and followup
These resulted in too many new exciting behaviors for the improvement
of nested refs behavior to be worth it. We should try again later.
Also, use Parser::MARKER_PREFIX instead of $parser->uniqPrefix()
which has been deprecated in the meantime by 12571bde.