Add attr_extras so we can use that when cleaning up code.