Update spec prototypes

This series updates/corrects prototypes to match the manpage/code changes. I have several following changes dealing with the xml, and will later add a section describing these changes.