Partial work repairing the waterfall for strict mode.