Allow element to have both attributes and content

Because we have an immediate need for it, we created a fix for issue #375 which we now use internally.

If there's an interest in pulling this back, let me know and I'll add a test for it.