Makei configure less os-version specific, were possible.