Tidy up HMap's new options.