@filipw I agree. That's why I'm wondering if this is the correct way, or if we should convert `FilePreProcessor` to do processing in two phases and reuse it's functionality instead.