Tweaked patterns so they'll also work under OS/X.