These key getters are used mainly by commands/hubs.js, and by some very particular unit-tests.

If we move the commands/hubs.js references to these getters into here, the getters can go away.