...and one more little refactor...
That should have been obvious.