Improve error reporting.
The name of option is now shown in most cases when it's feasible, and clarify of the error messages has been improved throughout.
Patch from Leo Goodstadt.