DO REPEAT: Improve error messages and coding style.