variable-display: Improve coding style and error messages.