Relax some constraints, change some others, and eliminate a package we no longer use.