fixup! Cleanup Element's AttributeHandlers