I agree with Olivier. The former version was more readable.