Move handling of multiple mappings into watch.go in prep for JSON config support.