Don't call filename_filter recursively. TODOs and cleanup.