Trying to clean some still, not touched fw_nav.c yet.