would it be simpler to drop the optimization here entirely - the builder should take care of it?