[BUGFIX beta] Provide more/better information to instrumentation.