It is fine to leave this here for now, I understand that there aren't any other options. @dottedmag is looking at a RuntimeContext and we may move it over there later.