It would be nice to have a more comprehensive mechanism but this is a big improvement over manually editing the script.