This makes it possible to simplify a bit more code inside xharness as well.
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>