Handle `null` declarations from rework-visit

Close #32 
Unrelated but here we can see that rework is bad at keeping author intention... :/