Handle `null` declarations from rework-visit

Close #32 
when is it annoying other than for writing tests?