Merge "RemexDriver: improved tracing"