Fix missed cases from previous user iteration optimizations.