Static analysis build fixes, follow-up to bug 497948.