Update behavior of 2D variable mapping.

* Update existing specs and implemenation for new behavior.
* Add specs for new behavior.
* Fixes #17.