Streamlining the dependencies a bit.