Merge these null checks.
Cleanup some code comments and reuse keeperId.