Merge "Rewrite function definitions with identifier lists"