Small cleanup of attribute mess.