Adapted unweave to Matthias' fixes. It's still off-by-one-space in some cases.
Adapted unweave to Matthias' fixes. It's still off-by-one-space in some cases.

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator