Remove workarounds added while implementing --wrap, so that redundand
trailing sequences like `\x1b[32m\x1b[0m` are removed.

Also, actually run wrap regression tests; it should have been done in
the --wrap commit but somehow slipped away while addressing PR comments.