Runner improvements

Overall I like those changes, especially since they cleanly fill a gap that I neglected.