Tighten dependencies a little. Ref #325.

Signed-off-by: Ben Corlett <bencorlett@me.com>