Some more instrumentation automation additions.