Refactor AA implementation

This is mostly about getting rid of the enigmatic type and field names.