Match the spec properly

Fixes #1 and #2.
Hmm, that's true. Sure, why not keep it.