Properly resorting to type 'any' for templated classes
Expanding typedef types to their underlying values
Various bug fixes