Improve internal types in push code.