Made #16 more readable.