Refactor: minimize number of command listeners, remove extra indirection where direct calls are possible.