Better coverage of pathnames.