Typedefs and indentation fixes from the Andy Zhang/PAX macro argument patch.