Finish removing structure-renaming macros

These weren't type safe and some had typos that would start causing
problems if anyone used them.

Signed-off-by: Adam C. Emerson <aemerson@linuxbox.com>