[Paul M]

A few points involving 4.2.1

Dont use the navbar_after_links or navbar_after_sublinks template hooks.
They were supposed to have been removed, and will probably go in 4.2.1.

These two hooks are likely to disappear as well - collapse_navigation_state, expand_navigation_state

The reason they existed was because the bit definitions for the state field were not defined in the vb bitfield file (long story), so the hooks were there to cope with any custom ones. However, another change due in 4.2.1 is to convert the state field to use bitfields defined in the vb bitfield file, so it will not be necessary to use any hooks to add to them.

Also, 4.2.1 should see all the Nav Man functions moved out of functions.php into their own file, making it easier to find, update or replace them in the future.