A couple more regex tweaks to work with POSIX.