Merge "Fix up various issues leading to bug 40780."