Handle `null` declarations from rework-visit

Close #32