[Beaker-devel] Simplify inventorying systems in Beaker