Improve error reporting.
Regenerate OASIS.