Account for reserved subparts, which don't have children
Merge pull request #663 from cmc333333/reserved-subparts

Account for reserved subparts, which don't have children