Actually, now that I look at it more closely, attributes on the declaration are carried over onto the directive's template.  That simplifies some things.  Now, explicitly set class and data-clientid and simply default the other attributes that existed in previous versions.  This should allow for explicit setting of supported attributes without requiring the directive to get involved.
Minor cleanup of comments and variable names.