Fixing map-parsing bug

The issue was that trailing delimiters ruined EVERYTHING.  Problem
solved!
Adding test to cover recently-fixed bug