More const correctness
More generic message handling