First attempt to fix sub-Space linking

The biggest bug with sub-Spaces is the fact that links *from* them to
elsewhere wind up wrong, because they don't account for the sub-paths.
Fixed this in a couple of places, although it's probably not perfect
yet.