More code style cleanup.
Make error messages more errory.