#1081: Cleanup and some dependency upgrades.