Cleaning up TraceFileVerifier (passes checkstyle except for inner assignment violations).