Changed all recursive *map assignments to be non-recursive, fixed version test.

Changed all *map assignments to use the proper non-recursive format.
Fixed another version test to use 703 and not 730.