Reducing stack depth a bit in some cases