Merge pull request #3064 from Diapolo/style
style-police: fixed badly readable code in ProcessMessage()