Moved the tabplus1 grammar term to a more relevant place in the spec.