Oh my, that was an easy refactor.

Would be nice to do this in the talk.