Introduce sane_unset and use it to ensure proper && chaining