A few more tweaks to indent iterator for subnav