Continue to straighten out enum usage.
Minor fix in debug.c.