Fix more import weirdness.
Call old-style `FileNode`s `FancyFileNode` to avoid confusion.
Fix some more overlooked things.