Combine readMessage with ReadMessage.

These functions used to be split into multiple files, but since the code
was reorganized there is no longer any reason to split them.