VX(He): Refactor a bit the command mechanism.