Remove struct types used in templating, replace with single use variables.