Pruning usage of AttributeVariable and cleaning up associated code

[AsherGlick]

We were using the dataclass AttributeVariable very wrongly, this cleans that up by creating a new minimal dataclass for the fields we need to pass into the attribute classes. Additionally cleans up a few other things associated with the code that needed to be changed.