I think we can probably squeeze out the whole `NullUser` but we can leave it for later. This doesn't need to hold up this PR.