Small cleanup of attribute mess.

Minimize some differences using a typedef.