Merge "Fix ids and remove invoke when inlining."