Fixed pluralization errors in protocol macro names.
Further work on the elisp; now more than half done there.