Fix the arg list NormalizedMap stuff and get the tests green.