Move conditional out into new method.