Switch to use File.fnmatch rather than one-off regex