Post #2564228

Now you need to write a layer of typedefs to map the expanded names back to their original types.