Yeah, gotta fix those up. I think some of them are going to end up as `Path`, others as `Url` or something.