Ensure maps properly handle variables in values
Get rid of record rewriter