Update for new-style event messages.

plus fix indentations