Make sure file_type is strip'd as well.

Follow up to 4b78aedde789d945a19a99351bc58ef7472a6121,
so that the order of pre-processing events is less important.