Some quick tweaks to pick_object / pick_val handling