Avoid some false positives in the CheckNullableReturn lint check

Fixes #656