Add builder.defaults simplification, add Boolean support.