Introducing a builder is a real improvement here.