A final commit while this works

Because I'm planning to switch from strings to paths RIGHT NOW, and
that's probably going to break things.