These are additional patches added after my previous set. The main thing they do is remove that problematic step of hiding the "8h" files, and restoring some doxygen comments that were lost in those files. I also made a tiny change to the Protocol docs suggested by Derek.