Eliminate some usage of VOID and its variants.
Remove unnecessary #undef's