Consolidate dependencies. Closes #475.