More cleanup: Expand tabs and some more indentation fixes No functional change
When dtrace support is not present, compile it all the way out.