Agreed - much nicer in `base::get_item_val`. Using the helper now as well.

PR updated and squashed into one commit as well.