We don't really need trace-define anymore...