Peel away old-style file remapping typedefs and cruft