Remove superfluous nil from return nil