[CLEANUP] Makes ESAPI transitive.