More updates to predeclared types.