Improve the BuilderProxy pattern.