General cleanup. Upgrade build tools.