- replace seemingly unneeded call to "eval" by expand operator
- replace calls to deprecated "ad_parameter" by non-deprecated counterparts