Merge "Fix broken handling of instrumentation lists."