Merge "Refactor BuildInvoke."