Really final changes; this version went to IETF