Made arc and no-arc libraries consistent and not circularly dependent