Finally lay dependencies to rest (I hope!).
41 files changed