Deal with changing arg counts in AMQP callbacks