Add vendor-specific attributes support and..

..retab the whole thing.