Use menu_block in more places.

Also a small refactoring of menu_block internals.
Removed the old, now unused nav helper.