Some housekeeping changes for storing ability attributes.