More work on the file filtering mechanism.