Whoops, didn't realize this spec used manual generation. A quick diff review shows a lot of formatting changes, but the significant bits still work the same.

Author: tabatkins