Resolve checkstyle issues in the new builder.
port examples to the new builder API