Make unset options less catastrophic, fix variant edit bug