There is really no need to seperate off the runner into
a unit that builds a state-machine and then provides a tiny
utility function, both of these can just be in the same class
and code so that it is easier to understand/read.
Change-Id: I18b97514e230451ef804a878a0edcea4d0b2ad20