No longer need to test against None