wswsh: Improve the regexes (untested, but it *should* work)