Remove some unnecessary requirements.

"make test" still passes in a clean checkout after these changes.