Allow default expressions by reassignment if checking "... is None"
Merge branch 'master' into mammoth