JBIDE-15575 - cleanup of tracing to remove code duplication