Fixed nullness annotation problems.