Remove some builders in favor of estemplate substitutions.