Schema -> Scheme.
Remove nesting of exceptions. Standardise.
Add in old incorrect values for compatibility.