Options arguments refactor

Use Map::setAll() instead of Col::merge() where appropriate.

Fixes for #12