More comments, cleanup some legacy code.

Also, added some internal navigation helpers to Context.