More nav fixture changes, this time with less infinite recursion.