Extracted a couple of functions and it made it "clear" how to avoid
storing two lists of branches in memory.