switch magic number *again* (hopefully for the last time!) and RFC2119ify the spec