Upgrade all remaining dependencies

I broke out other dependency updates into individual commits if those
updates required edits to source. These remaining updates should all be
safe to apply as one large block!