Tweak spec support for master branch.

Update dependencies and syntax etc and hopefully it will give less
random failures.