DOC:  Cleaning up checking of dependencies.