Problem: RFC 37 is out of date

Solution: clean up the RFC and ensure differences from RFC 23 are
clear.