Make two optional dependencies looser.