juju/juju — pull request #263 by davecheney (2014-07-08 02:17:24+00:00)
Title: Use type switch in merge functions

Followup PR from #262.

* Use a type switch rather than a type assertion when checking for unexpected values in merge functions
* Drive by code cleanups.