Add support for nested struct arrays in struct2map and map2struct
Cleaning map2struct

We were doing a . => __ and then a __ => .   This delta removes the
double strrep