Follow-up commit fixing some things forgotten.

Move towards variable messages.