Generalizing Unwinding in UPARSE

I realized this thread doesn't actually have the solution at the end... :-/

Needs a rewrite.