Fix up a lot of the error messages reported by error matching.

This addresses issue #14.