Split out a little more code.