some more work on adding null-annotations