Tweaked construction of messages for clearer code