Merge task-specific/target-specific options with default options

Cleaner handling of merging the default options