I'd prefer to set the null here and get the null-handling code out of `handleBasicRollup()`.