Reclassify references, make IANA considerations consistent