Includes some unification of error text, narrower wrap margin. 'var' output now lists the variable types.