Nuke ctrace entirely; conditionalize tracing on TRACE; other minor cleanups.