Add more message arguments. See #1214.