Merge ProcDef and ProcDecl into Proc.