Some more abstraction cleanup - ensure the versions get set when --no-ompi is used