Fix a few things for the conversion to structured markup.

Removed texinfo special cases, since there's likely a new info
process.