f70188aa47
This makes the code marginally more readable, and cuts about 500 bytes off the size of the main thread's stack. Automated import of CL 143840