Flatten out structure in prep for refactoring feature ID passing.