Can we avoid the nil checks here?