Match the spec properly

Fixes #1 and #2.
I’m fine with removing it; just want to make sure we’re on the same page here.