This should make it a bit easier to test in a development setup. It may also simplify the scripting a little.