LUN-733: Refactor file subtype matching.