Parse del statement
Minor cleanups