This grouping, which was a TODO for a long time, reduces the script size
by about 5kB.

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>