Use stricter version constraints

In response to my concerns raised in #1418.