Improve handling of Pointers inside structs.  Fixes #19