Merge "Fix creating self-recursive obsolete methods."