Added convenience typedefs and improved namespacing on existing macros.