The groups are redundant and the dynamic inventory is annoying. (Detailed explanation in the commit messages.)