* Tweak - Remove legacy code.
* Fix - Use proper escaping for attributes.
* Tweak - WC 3.9 compatibility.