We need to find a better way to do this for the whole spec. I propose we take it on the chin for this one, and refactor the whole damn thing in a separate PR.