adjustments for relaxed composite literal syntax
adjustments for relaxed composite literal syntax

R=r
DELTA=41  (0 added, 21 deleted, 20 changed)
OCL=29219
CL=29219
abustany/go,abustany/go,abustany/go,abustany/go,abustany/go,abustany/go,abustany/go