Right - but that would be solved by my other suggestion. Given that the command is an expression, we can't assume it's the same command for every message.