I have a minimal change (22 insertions, 20 deletions - with tests) that makes defining action.message much easier.