Simplify the choice of the runtime system before integrating the new ones

Simplifies the way we choose the runtime before integrating PR !106 and !108 (merged)