Update dependencies and simplify.