Hans Leidekker : msi: Improve tracing.