result in hopefully-less-confusing error messages when the new definition
isn't compatible with the old; minor other cleanup.