Making cross-OS changes more robust.

Better to use the built-in tools for this rather than our own regexes.