more refactoring around prefix parameters in the NFN code