Fix variable name in dfmc tracing.

Also a couple of fixups to formatting.