That part is all sane. I just tossed a commit on top to fix a different but related problem in the spec (perhaps brought in by my pull request).