Merged a couple more f != -1 if sections.