More work on filename matching.