Cosmetic fixes in multipart builder.