force_navigate/go_to mark

The meat of this PR is really in the last commit, but I tried to break out the other changes I made in this process into their own commits.