- (merge (host cfg) (OC.host opt_cfg))
- (merge (password cfg) (OC.password opt_cfg))
- (merge (port cfg) (OC.port opt_cfg))
- (merge (username cfg) (OC.username opt_cfg))
+ (merge (detail_query cfg) (OC.detail_query opt_cfg))
+ (OC.merge_maybes (host cfg) (OC.host opt_cfg))
+ (OC.merge_maybes (password cfg) (OC.password opt_cfg))
+ (OC.merge_maybes (port cfg) (OC.port opt_cfg))
+ (merge (summary_query cfg) (OC.summary_query opt_cfg))
+ (OC.merge_maybes (username cfg) (OC.username opt_cfg))