Bug 339809 - Kirk Beitz' fix to show actual call location in EDC traces + remove some unneeded @SuppressWarnings("unused") that were causing compile errors.