Backported +vstr and -vstr from ioUrT