Arguably, the earlier structure was unnecessarily verbose. Same as commit e0b877b26c5e93809b2a53b6c46326d5e31fa0e8.