Automatic merge from submit-queue Autoconvert cleanups A few accumulated cleanups to conversion, and then a big change. Please review commit-by-commit. Verified by nuking all generated files and comparing the new results. cc @lavalamp