Simplify the builders by removing their reliance on state