Moar.

Still sorting out my local env thanks to xml2rfc.py weirdness, so it may have syntax errors; will correct as I find.