Resolve "Out of bounds panics on map assignments"

Closes #844 (closed)

If this gets merged, we should open up a new issue to address the behavior mentioned in the commits.