make clear_value_on_removal and auto_squeeze opts

cf gh-2
move from clear_value_on_removal to on_removal

cf gh-2