[flang-commits] [flang] Parallel runtime library design doc (PRIF) (PR #76088)

Brad Richardson via flang-commits flang-commits at lists.llvm.org
Thu Aug 22 06:24:05 PDT 2024


https://github.com/everythingfunctional updated https://github.com/llvm/llvm-project/pull/76088

>From 2bace2e9e15001fc1b3df631e9fc91b298226db5 Mon Sep 17 00:00:00 2001
From: Brad Richardson <everythingfunctional at protonmail.com>
Date: Fri, 22 Dec 2023 08:20:53 -0600
Subject: [PATCH 1/4] Create design doc for Parallel Fortran feature support

Co-authored-by: Katherine Rasmussen <krasmussen at lbl.gov>
Co-authored-by: Dan Bonachea <dobonachea at lbl.gov>
Co-authored-by: Damian Rouson <rouson at lbl.gov>
---
 flang/docs/ParallelFortranRuntime.md | 1822 ++++++++++++++++++++++++++
 1 file changed, 1822 insertions(+)
 create mode 100644 flang/docs/ParallelFortranRuntime.md

diff --git a/flang/docs/ParallelFortranRuntime.md b/flang/docs/ParallelFortranRuntime.md
new file mode 100644
index 00000000000000..392fefd7f927ec
--- /dev/null
+++ b/flang/docs/ParallelFortranRuntime.md
@@ -0,0 +1,1822 @@
+<!--===- docs/CoarrayFortranRuntime.md
+
+   Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+   See https://llvm.org/LICENSE.txt for license information.
+   SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+-->
+# Parallel Runtime Interface for Fortran (PRIF) Design Document, Revision 0.2
+
+Damian Rouson  
+Brad Richardson  
+Dan Bonachea  
+Katherine Rasmussen  
+Lawrence Berkeley National Laboratory, USA  
+lbl-flang at lbl.gov  
+
+# Abstract
+
+This design document proposes an interface to support the parallel features of
+Fortran, named the Parallel Runtime Interface for Fortran (PRIF). PRIF is a
+proposed solution in which the runtime library is responsible for coarray
+allocation, deallocation and accesses, image synchronization, atomic operations,
+events, and teams. In this interface, the compiler is responsible for
+transforming the invocation of Fortran-level parallel features into procedure
+calls to the necessary PRIF procedures. The interface is designed for
+portability across shared- and distributed-memory machines, different operating
+systems, and multiple architectures. Implementations of this interface are
+intended as an augmentation for the compiler's own runtime library. With an
+implementation-agnostic interface, alternative parallel runtime libraries may be
+developed that support the same interface. One benefit of this approach is the
+ability to vary the communication substrate. A central aim of this document is
+to define a parallel runtime interface in standard Fortran syntax, which enables
+us to leverage Fortran to succinctly express various properties of the procedure
+interfaces, including argument attributes.
+
+> **WORK IN PROGRESS** This is still a draft a may continue to evolve.
+> Feedback and questions should be directed to lbl-flang at lbl.gov.
+
+# Changelog
+
+## Rev. 0.1
+
+* Identify parallel features
+* Sketch out high-level design
+* Decide on compiler vs PRIF responsibilities
+
+## Rev. 0.2 (Dec. 2023)
+
+* Change name to PRIF
+* Fill out interfaces to all PRIF provided procedures
+* Write descriptions, discussions and overviews of various features, arguments, etc.
+
+# Problem description
+
+In order to be fully Fortran 2023 compliant, a Fortran compiler needs support for
+what is commonly referred to as coarray fortran, which includes features
+related to parallelism. These features include the following statements,
+subroutines, functions, types, and kind type parameters:
+
+* **Statements:**
+  - _Synchronization:_ `sync all`, `sync images`, `sync memory`, `sync team`
+  - _Events:_ `event post`, `event wait`
+  - _Notify:_ `notify wait`
+  - _Error termination:_ `error stop`
+  - _Locks:_ `lock`, `unlock`
+  - _Failed images:_ `fail image`
+  - _Teams:_ `form team`, `change team`
+  - _Critical sections:_ `critical`, `end critical`
+* **Intrinsic functions:** `num_images`, `this_image`, `lcobound`, `ucobound`,
+  `team_number`, `get_team`, `failed_images`, `stopped_images`, `image_status`,
+  `coshape`, `image_index`
+* **Intrinsic subroutines:**
+  - _Collective subroutines:_ `co_sum`, `co_max`, `co_min`, `co_reduce`, `co_broadcast`
+  - _Atomic subroutines:_ `atomic_add`, `atomic_and`, `atomic_cas`,
+    `atomic_define`, `atomic_fetch_add`, `atomic_fetch_and`, `atomic_fetch_or`,
+    `atomic_fetch_xor`, `atomic_or`, `atomic_ref`, `atomic_xor`
+  - _Other subroutines:_ `event_query`
+* **Types, kind type parameters, and values:**
+  - _Intrinsic derived types:_ `event_type`, `team_type`, `lock_type`, `notify_type`
+  - _Atomic kind type parameters:_ `atomic_int_kind` and `atomic_logical_kind`
+  - _Values:_ `stat_failed_image`, `stat_locked`, `stat_locked_other_image`,
+    `stat_stopped_image`, `stat_unlocked`, `stat_unlocked_failed_image`
+
+In addition to being able to support syntax related to the above features,
+compilers will also need to be able to handle new execution concepts such as
+image control. The image control concept affects the behaviors of some
+statements that were introduced in Fortran expressly for supporting parallel
+programming, but image control also affects the behavior of some statements
+that pre-existed parallelism in standard Fortran:
+
+* **Image control statements:**
+  - _Pre-existing statements_: `allocate`, `deallocate`, `stop`, `end`,
+    a `call` referencing `move_alloc` with coarray arguments
+  - _New statements:_ `sync all`, `sync images`, `sync memory`, `sync team`,
+    `change team`, `end team`, `critical`, `end critical`, `event post`,
+    `event wait`, `form team`, `lock`, `unlock`, `notify wait`
+
+One consequence of the statements being categorized as image control statements
+will be the need to restrict code movement by optimizing compilers.
+
+# Proposed solution
+
+This design document proposes an interface to support the above features,
+named Parallel Runtime Interface for Fortran (PRIF). By defining an
+implementation-agnostic interface, we envision facilitating the development of
+alternative parallel runtime libraries that support the same interface. One
+benefit of this approach is the ability to vary the communication substrate.
+A central aim of this document is to use a parallel runtime interface in
+standard Fortran syntax, which enables us to leverage Fortran to succinctly
+express various properties of the procedure interfaces, including argument
+attributes. See [Rouson and Bonachea (2022)] for additional details.
+
+## Parallel Runtime Interface for Fortran (PRIF)
+
+The Parallel Runtime Interface for Fortran is a proposed interface in which the
+PRIF implementation is responsible for coarray allocation, deallocation and
+accesses, image synchronization, atomic operations, events, and teams. In this
+interface, the compiler is responsible for transforming the invocation of
+Fortran-level parallel features to add procedure calls to the necessary PRIF
+procedures. Below you can find a table showing the delegation of tasks
+between the compiler and the PRIF implementation. The interface is designed for
+portability across shared and distributed memory machines, different operating
+systems, and multiple architectures. The Caffeine implementation,
+[see below](#caffeine---lbl's-implementation-of-the-parallel-runtime-interface-for-fortran),
+of the Parallel Runtime Interface for Fortran plans to support the following
+architectures: x86_64, PowerPC64, AArch64, with the possibility of supporting
+more as requested. Implementations of this interface are intended as an
+augmentation for the compiler's own runtime library. While the interface can
+support multiple implementations, we envision needing to build the PRIF implementation
+as part of installing the compiler. The procedures and types provided
+for direct invocation as part of the PRIF implementation shall be defined in a
+Fortran module with the name `prif`.
+
+## Delegation of tasks between the Fortran compiler and the PRIF implementation
+
+The following table outlines which tasks will be the responsibility of the
+Fortran compiler and which tasks will be the responsibility of the PRIF
+implementation. A 'X' in the "Fortran compiler" column indicates that the compiler has
+the primary responsibility for that task, while a 'X' in the "PRIF implementation"
+column indicates that the compiler will invoke the PRIF implementation to perform
+the task and the PRIF implementation has primary responsibility for the task's
+implementation. See the [Procedure descriptions](#procedure-descriptions)
+for the list of PRIF implementation procedures that the compiler will invoke.
+
+|                                                      Tasks                                                                       |  Fortran compiler  | PRIF implementation |
+|----------------------------------------------------------------------------------------------------------------------------------|--------------------|---------------------|
+| Establish and initialize static coarrays prior to `main`                                                                         |         X          |                     |
+| Track corank of coarrays                                                                                                         |         X          |                     |
+| Track local coarrays for implicit deallocation when exiting a scope                                                              |         X          |                     |
+| Initialize a coarray with `SOURCE=` as part of allocate-stmt                                                                     |         X          |                     |
+| Provide `lock_type` coarrays for `critical-construct`s                                                                           |         X          |                     |
+| Provide final subroutine for all derived types that are finalizable or that have allocatable components that appear in a coarray |         X          |                     |
+| Track variable allocation status, including resulting from use of `move_alloc`                                                   |         X          |                     |
+| Track coarrays for implicit deallocation at `end-team-stmt`                                                                      |                    |          X          |
+| Allocate and deallocate a coarray                                                                                                |                    |          X          |
+| Reference a coindexed-object                                                                                                     |                    |          X          |
+| Team stack abstraction                                                                                                           |                    |          X          |
+| `form-team-stmt`, `change-team-stmt`, `end-team-stmt`                                                                            |                    |          X          |
+| Intrinsic functions related to Coarray Fortran, like `num_images`, etc.                                                          |                    |          X          |
+| Atomic subroutines                                                                                                               |                    |          X          |
+| Collective subroutines                                                                                                           |                    |          X          |
+| Synchronization statements                                                                                                       |                    |          X          |
+| Events                                                                                                                           |                    |          X          |
+| Locks                                                                                                                            |                    |          X          |
+| `critical-construct`                                                                                                             |                    |          X          |
+
+### Caffeine - LBL's Implementation of the Parallel Runtime Interface for Fortran
+
+Implementations of some parts of the Parallel Runtime Interface for Fortran
+exist in [Caffeine], a parallel runtime library targeting coarray Fortran
+compilers. Caffeine will continue to be developed in order to fully implement
+the proposed Parallel Runtime Interface for Fortran. Caffeine uses the
+[GASNet-EX] exascale networking middleware but with the implementation-agnostic
+interface and the ability to vary the communication substrate, it might also be
+possible to develop wrappers that would support the proposed interface with
+[OpenCoarrays], which uses the Message Passing Interface ([MPI]).
+
+## Types Descriptions
+
+### Fortran Intrinsic Derived types
+
+These types will be defined in the PRIF implementation and it is proposed that the
+compiler will use a rename to use the PRIF implementation definitions for these
+types in the compiler's implementation of the `ISO_Fortran_Env` module. This
+enables the internal structure of each given type to be tailored as needed for
+a given implementation.
+
+#### `prif_team_type`
+
+* implementation for `team_type` from `ISO_Fortran_Env`
+
+#### `prif_event_type`
+
+* implementation for `event_type` from `ISO_Fortran_Env`
+
+#### `prif_lock_type`
+
+* implementation for `lock_type` from `ISO_Fortran_Env`
+
+#### `prif_notify_type`
+
+* implementation for `notify_type` from `ISO_Fortran_Env`
+
+### Constants in `ISO_FORTRAN_ENV`
+
+These values will be defined in the PRIF implementation and it is proposed that the
+compiler will use a rename to use the PRIF implementation definitions for these
+values in the compiler's implementation of the `ISO_Fortran_Env` module.
+
+#### `PRIF_ATOMIC_INT_KIND`
+
+This shall be set to an implementation defined value from the `INTEGER_KINDS`
+array.
+
+#### `PRIF_ATOMIC_LOGICAL_KIND`
+
+This shall be set to an implementation defined value from the `LOGICAL_KINDS`
+array.
+
+#### `PRIF_CURRENT_TEAM`
+
+This shall be a value of type `integer(c_int)` that is defined by the
+implementation and shall be distinct from the values `PRIF_INITIAL_TEAM` and
+`PRIF_PARENT_TEAM`
+
+#### `PRIF_INITIAL_TEAM`
+
+This shall be a value of type `integer(c_int)` that is defined by the
+implementation and shall be distinct from the values `PRIF_CURRENT_TEAM` and
+`PRIF_PARENT_TEAM`
+
+#### `PRIF_PARENT_TEAM`
+
+This shall be a value of type `integer(c_int)` that is defined by the
+implementation and shall be distinct from the values `PRIF_CURRENT_TEAM` and
+`PRIF_INITIAL_TEAM`
+
+#### `PRIF_STAT_FAILED_IMAGE`
+
+This shall be a value of type `integer(c_int)` that is defined by the
+implementation to be negative if the implementation cannot detect failed images
+and positive otherwise and shall be distinct from `PRIF_STAT_LOCKED`,
+`PRIF_STAT_LOCKED_OTHER_IMAGE`, `PRIF_STAT_STOPPED_IMAGE`, `PRIF_STAT_UNLOCKED` and
+`PRIF_STAT_UNLOCKED_FAILED_IMAGE`.
+
+#### `PRIF_STAT_LOCKED`
+
+This shall be a value of type `integer(c_int)` that is defined by the
+implementation and shall be distinct from `PRIF_STAT_FAILED_IMAGE`,
+`PRIF_STAT_LOCKED_OTHER_IMAGE`, `PRIF_STAT_STOPPED_IMAGE`, `PRIF_STAT_UNLOCKED` and
+`PRIF_STAT_UNLOCKED_FAILED_IMAGE`.
+
+#### `PRIF_STAT_LOCKED_OTHER_IMAGE`
+
+This shall be a value of type `integer(c_int)` that is defined by the
+implementation and shall be distinct from `PRIF_STAT_FAILED_IMAGE`,
+`PRIF_STAT_LOCKED`, `PRIF_STAT_STOPPED_IMAGE`, `PRIF_STAT_UNLOCKED` and
+`PRIF_STAT_UNLOCKED_FAILED_IMAGE`.
+
+#### `PRIF_STAT_STOPPED_IMAGE`
+
+This shall be a positive value of type `integer(c_int)` that is defined by the
+implementation and shall be distinct from `PRIF_STAT_FAILED_IMAGE`,
+`PRIF_STAT_LOCKED`, `PRIF_STAT_LOCKED_OTHER_IMAGE`, `PRIF_STAT_UNLOCKED` and
+`PRIF_STAT_UNLOCKED_FAILED_IMAGE`.
+
+#### `PRIF_STAT_UNLOCKED`
+
+This shall be a value of type `integer(c_int)` that is defined by the
+implementation and shall be distinct from `PRIF_STAT_FAILED_IMAGE`,
+`PRIF_STAT_LOCKED`, `PRIF_STAT_LOCKED_OTHER_IMAGE`, `PRIF_STAT_STOPPED_IMAGE` and
+`PRIF_STAT_UNLOCKED_FAILED_IMAGE`.
+
+
+#### `PRIF_STAT_UNLOCKED_FAILED_IMAGE`
+
+This shall be a value of type `integer(c_int)` that is defined by the
+implementation and shall be distinct from `PRIF_STAT_FAILED_IMAGE`,
+`PRIF_STAT_LOCKED`, `PRIF_STAT_LOCKED_OTHER_IMAGE`, `PRIF_STAT_STOPPED_IMAGE` and
+`PRIF_STAT_UNLOCKED`.
+
+### PRIF specific types
+
+These types are used to represent opaque "descriptors" that can be passed to and
+from the PRIF implementation between operations.
+
+#### `prif_coarray_handle`
+
+* a derived type provided by the PRIF implementation and that will be opaque to the
+  compiler that represents a reference to a coarray variable is used for coarray
+  operations.
+* It maintains some "context data" on a per-image basis, which the compiler may
+  use to support proper implementation of coarray arguments, especially with
+  respect to automatic deallocation of coarrays at an `end team` statement. This
+  is accessed/set with the provided procedures `prif_get_context_handle` and
+  `prif_set_context_handle`. PRIF does not interpret the contents of this context data in
+  any way, and it is only accessible on the current image. The context data is
+  a property of the allocated coarray object, and is thus shared between all
+  handles and aliases that refer to the same coarray allocation (i.e. those
+  created from a call to `prif_alias_create`).
+
+#### `prif_critical_type`
+
+* a derived type provided by the PRIF implementation that will be opaque to the
+  compiler that will be used for implementing `critical` blocks
+
+## Procedure descriptions
+
+The PRIF API provides implementations of parallel Fortran features, as specified
+in Fortran 2023. For any given `prif_*` procedure that corresponds to a Fortran
+procedure or statement of similar name, the constraints and semantics associated
+with each argument to the `prif_` procedure match those of the analogous
+argument to the parallel Fortran feature, except where this document explicitly
+specifies otherwise. For any given `prif_*` procedure that corresponds to a Fortran
+procedure or statement of similar name, the constraints and semantics match those
+of the analogous parallel Fortran feature. Specifically, any required synchronization
+is performed by the PRIF implementation unless otherwise specified.
+
+Where possible, optional arguments are used for optional parts or different
+forms of statements or procedures. In some cases the different forms or presence
+of certain options change the return type or rank, and in those cases a generic
+interface with different specific procedures is used.
+
+### Common arguments
+
+* **`team`**
+  * a value of type `prif_team_type` that identifies a team that the
+    current image is a member of
+  * shall not be present with `team_number` except in a call to `prif_form_team`
+* **`team_number`**
+  * a value of type `integer(c_intmax_t)` that identifies a sibling team or
+    in a call to `prif_form_team`, which team to become a member of
+  * shall not be present with `team` except in a call to `prif_form_team`
+* **`image_num`, any argument identifying an image**
+  * May identify the current image
+
+### Integer and Pointer Arguments
+
+There are several categories of arguments where the PRIF implementation will need
+pointers and/or integers. These fall broadly into the following categories.
+
+1. `integer(c_intptr_t)`: Anything containing a pointer representation where
+   the compiler might be expected to perform pointer arithmetic
+2. `type(c_ptr)` and `type(c_funptr)`: Anything containing a pointer to an
+   object/function where the compiler is expected only to pass it (back) to the
+   PRIF implementation
+3. `integer(c_size_t)`: Anything containing an object size, in units of bytes
+   or elements, i.e. shape, element_size, etc.
+4. `integer(c_ptrdiff_t)`: strides between elements for non-contiguous coarray
+   accesses
+5. `integer(c_int)`: Integer arguments corresponding to image index and
+  stat arguments. It is expected that the most common arguments
+  appearing in Fortran code will be of default integer, it is expected that
+  this will correspond with that kind, and there is no reason to expect these
+  arguments to have values that would not be representable in this kind.
+6. `integer(c_intmax_t)`: Bounds, cobounds, indices, coindices, and any other
+  argument to an intrinsic procedure that accepts or returns an arbitrary
+  integer.
+
+The compiler is responsible for generating values and temporary variables as
+necessary to pass arguments of the correct type/size, and perform conversions
+when needed.
+
+#### sync-stat-list
+
+* **`stat`** : This argument is `intent(out)` representing the presence and
+  type of any error that occurs. A value of zero, indicates no error occurred.
+  It is of type `integer(c_int)`, to minimize the frequency that integer
+  conversions will be needed. If a different kind of integer is used as the
+  argument, it is the compiler's responsibility to use an intermediate variable
+  as the argument to the PRIF implementation procedure and provide conversion to the
+  actual argument.
+* **`errmsg` or `errmsg_alloc`** : There are two optional arguments for this,
+  one which is allocatable and one which is not. It is the compiler's
+  responsibility to ensure the appropriate optional argument is passed.
+  If no error occurs, the definition status of the actual argument is unchanged.
+
+### Program startup and shutdown
+
+For a program that uses parallel Fortran features, the compiler shall insert
+calls to `prif_init` and `prif_stop`. These procedures will initialize and
+terminate the parallel runtime. `prif_init` shall be called prior
+to any other calls to the PRIF implementation.
+
+#### `prif_init`
+
+* **Description**: This procedure will initialize the parallel environment.
+* **Procedure Interface**:
+```
+subroutine prif_init(exit_code)
+  integer(c_int), intent(out) :: exit_code
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`exit_code`**: a non-zero value indicates an error occurred during
+    initialization.
+
+#### `prif_stop`
+
+* **Description**: This procedure synchronizes all executing images, cleans up
+  the parallel runtime environment, and terminates the program.
+  Calls to this procedure do not return.
+* **Procedure Interface**:
+```
+subroutine prif_stop(quiet, stop_code_int, stop_code_char)
+  logical(c_bool), intent(in) :: quiet
+  integer(c_int), intent(in), optional :: stop_code_int
+  character(len=*), intent(in), optional :: stop_code_char
+end subroutine
+```
+* **Further argument descriptions**: At most one of the arguments
+  `stop_code_int` or `stop_code_char` shall be supplied.
+  * **`quiet`**: if this argument has the value `.true.`, no output of
+    signaling exceptions or stop code will be produced. Note that in the case
+    the statement does not contain this optional part, the compiler should
+    provide the value `.false.`.
+  * **`stop_code_int`**: is used as the process exit code if it is provided.
+    Otherwise, the process exit code is `0`.
+  * **`stop_code_char`**: is written to the unit identified by the named
+    constant `OUTPUT_UNIT` from the intrinsic module `ISO_FORTRAN_ENV` if
+    provided.
+
+#### `prif_error_stop`
+
+* **Description**: This procedure terminates all executing images
+  Calls to this procedure do not return.
+* **Procedure Interface**:
+```
+subroutine prif_error_stop(quiet, stop_code_int, stop_code_char)
+  logical(c_bool), intent(in) :: quiet
+  integer(c_int), intent(in), optional :: stop_code_int
+  character(len=*), intent(in), optional :: stop_code_char
+end subroutine
+```
+* **Further argument descriptions**: At most one of the arguments
+  `stop_code_int` or `stop_code_char` shall be supplied.
+  * **`quiet`**: if this argument has the value `.true.`, no output of
+    signaling exceptions or stop code will be produced. Note that in the case
+    the statement does not contain this optional part, the compiler should
+    provide the value `.false.`.
+  * **`stop_code_int`**: is used as the process exit code if it is provided.
+    Otherwise, the process exit code is a non-zero value.
+  * **`stop_code_char`**: is written to the unit identified by the named
+    constant `ERROR_UNIT` from the intrinsic module `ISO_FORTRAN_ENV` if
+    provided.
+
+#### `prif_fail_image`
+
+* **Description**: causes the executing image to cease participating in
+  program execution without initiating termination.
+  Calls to this procedure do not return.
+* **Procedure Interface**:
+```
+subroutine prif_fail_image()
+end subroutine
+```
+
+### Image Queries
+
+#### `prif_num_images`
+
+* **Description**: Query the number of images in the specified or current team.
+* **Procedure Interface**:
+```
+subroutine prif_num_images(team, team_number, image_count)
+  type(prif_team_type), intent(in), optional :: team
+  integer(c_intmax_t), intent(in), optional :: team_number
+  integer(c_int), intent(out) :: image_count
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`team` and `team_number`**: optional arguments that specify a team. They
+    shall not both be present in the same call.
+
+#### `prif_this_image`
+
+* **Description**: Determine the image index or cosubscripts with respect to a
+  given coarray of the current image in a given team or the current team.
+  team, or the cosubscripts
+* **Procedure Interface**:
+```
+interface prif_this_image
+  subroutine prif_this_image_no_coarray(team, image_index)
+    type(prif_team_type), intent(in), optional :: team
+    integer(c_int), intent(out) :: image_index
+  end subroutine
+
+  subroutine prif_this_image_with_coarray( &
+      coarray_handle, team, cosubscripts)
+    type(prif_coarray_handle), intent(in) :: coarray_handle
+    type(prif_team_type), intent(in), optional :: team
+    integer(c_intmax_t), intent(out) :: cosubscripts(:)
+  end subroutine
+
+  subroutine prif_this_image_with_dim( &
+      coarray_handle, dim, team, cosubscript)
+    type(prif_coarray_handle), intent(in) :: coarray_handle
+    integer(c_int), intent(in) :: dim
+    type(prif_team_type), intent(in), optional :: team
+    integer(c_intmax_t), intent(out) :: cosubscript
+  end subroutine
+end interface
+```
+* **Further argument descriptions**:
+  * **`cosubscripts`**: the cosubcripts that would identify the current image
+    in the specified team when used as coindices for the specified coarray
+  * **`dim`**: identify which of the elements from `cosubscripts` should be
+    returned as the `cosubscript` value
+  * **`cosubscript`**: the element identified by `dim` or the array
+    `cosubscripts` that would have been returned without the `dim` argument
+    present
+
+#### `prif_failed_images`
+
+* **Description**: Determine the image indices of known failed images, if any.
+* **Procedure Interface**:
+```
+subroutine prif_failed_images(team, failed_images)
+  type(prif_team_type), intent(in), optional :: team
+  integer(c_int), allocatable, intent(out) :: failed_images(:)
+end subroutine
+```
+
+#### `prif_stopped_images`
+
+* **Description**: Determine the image indices of images known to have initiated
+  normal termination, if any.
+* **Procedure Interface**:
+```
+subroutine prif_stopped_images(team, stopped_images)
+  type(prif_team_type), intent(in), optional :: team
+  integer(c_int), allocatable, intent(out) :: stopped_images(:)
+end subroutine
+```
+
+#### `prif_image_status`
+
+* **Description**: Determine the image execution state of an image
+* **Procedure Interface**:
+```
+impure elemental subroutine prif_image_status(image, team, image_status)
+  integer(c_int), intent(in) :: image
+  type(prif_team_type), intent(in), optional :: team
+  integer(c_int), intent(out) :: image_status
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`image`**: the image index of the image in the given or current team for
+    which to return the execution status
+  * **`team`**: if provided, the team from which to identify the image
+  * **`image_status`**: has the value `PRIF_STAT_FAILED_IMAGE` if the identified
+    image has failed, `PRIF_STAT_STOPPED_IMAGE` if the identified image has initiated
+    normal termination, or zero.
+
+### Coarrays
+
+#### Common arguments
+
+* **`coarray_handle`**
+  * Argument for many of the coarray access procedures
+  * scalar of type [`prif_coarray_handle`](#prif_coarray_handle)
+  * is a handle for the established coarray
+  * represents the distributed object of the coarray in the team in which it
+    was established
+* **`coindices`**
+  * Argument for many of the coarray access procedures
+  * 1d assumed-shape array of type `integer`
+  * correspond to the coindices appearing in a coindexed object
+* **`value`** or `local_buffer`
+  * Argument for `put` and `get` operations
+  * assumed-rank array of `type(*)` or `type(c_ptr)`
+  * It is the value to be sent in a `put` operation, and is assigned the value
+    retrieved in the case of a `get` operation
+* **`image_num`**
+  * identifies the image to be communicated with
+  * is the image index in the initial team
+  * may be the current image
+
+#### Allocation and deallocation
+
+Calls to `prif_allocate` and `prif_deallocate` are collective operations, while
+other allocation/deallocation operations are not. Note that a call to
+`move_alloc` with coarray arguments is also a collective operation, as described
+in the section below.
+
+##### Static coarray allocation
+
+The compiler is responsible to generate code that collectively runs
+`prif_allocate` once for each static coarray and initializes them where applicable.
+
+##### `prif_allocate`
+
+* **Description**: This procedure allocates memory for a coarray. 
+  This call is collective over the current team.  Calls to
+  `prif_allocate` will be inserted by the compiler when there is an explicit
+  coarray allocation or at the beginning of a program to allocate space for
+  statically declared coarrays in the source code. The PRIF implementation will
+  store the coshape information in order to internally track it during the
+  lifetime of the coarray.
+* **Procedure Interface**:
+```
+subroutine prif_allocate( &
+    lcobounds, ucobounds, lbounds, ubounds, element_length, &
+    final_func, coarray_handle, allocated_memory, &
+    stat, errmsg, errmsg_alloc)
+  integer(kind=c_intmax_t), intent(in) :: lcobounds(:), ucobounds(:)
+  integer(kind=c_intmax_t), intent(in) :: lbounds(:), ubounds(:)
+  integer(kind=c_size_t), intent(in) :: element_length
+  type(c_funptr), intent(in) :: final_func
+  type(prif_coarray_handle), intent(out) :: coarray_handle
+  type(c_ptr), intent(out) :: allocated_memory
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`lcobounds` and `ucobounds`**: Shall be the lower and upper bounds of the
+    codimensions of the coarray being allocated. Shall be 1d arrays with the
+    same dimensions as each other. The cobounds shall be sufficient to have a
+    unique index for every image in the current team.
+    I.e. `product(coshape(coarray)) >= num_images`.
+  * **`lbounds` and `ubounds`**: Shall be the the lower and upper bounds of the
+    local portion of the array. Shall be 1d arrays with the same dimensions as
+    each other.
+  * **`element_length`**: size of a single element of the array in bytes
+  * **`final_func`**: Shall be a function pointer to the final subroutine, if any,
+    for derived types. It is the responsibility of the compiler to generate
+    such a subroutine if necessary to clean up allocatable components, typically
+    with calls to `prif_deallocate_non_symmetric`. It may also be necessary to
+    modify the allocation status of the coarray variable, especially in the case
+    that it was allocated through a dummy argument. Its interface should be
+    equivalent to the following Fortran interface
+    ```
+    subroutine coarray_cleanup(handle, stat, errmsg) bind(C)
+      type(prif_coarray_handle), intent(in) :: handle
+      integer(c_int), intent(out) :: stat
+      character(len=:), intent(out), allocatable :: errmsg
+    end subroutine
+    ```
+    or to the following equivalent C prototype
+    ```
+    void coarray_cleanup( 
+        prif_handle_t* handle, int* stat, CFI_cdesc_t* errmsg)
+    ```
+    The coarray handle can then be interrogated to determine the memory address
+    and size of the data in order to orchestrate calling any necessary final
+    subroutines or deallocation of any allocatable components, or the context
+    data to orchestrate modifying the allocation status of a local variable
+    portion of the coarray. It will be invoked once on each image, upon
+    deallocation of the coarray.
+  * **`coarray_handle`**: Represents the distributed object of the coarray on
+    the corresponding team. The handle is created by the PRIF implementation and the
+    compiler uses it for subsequent coindexed-object references of the
+    associated coarray and for deallocation of the associated coarray.
+  * **`allocated_memory`**: A pointer to the local block of allocated memory for
+    the Fortran object. The compiler is responsible for associating the local
+    Fortran object with this memory, and initializing it if necessary.
+
+##### `prif_allocate_non_symmetric`
+
+* **Description**: This procedure is used to allocate components of coarray
+  objects.
+* **Procedure Interface**:
+```
+subroutine prif_allocate_non_symmetric( &
+    size_in_bytes, allocated_memory, stat, errmsg, errmsg_alloc)
+  integer(kind=c_size_t) :: size_in_bytes
+  type(c_ptr), intent(out) :: allocated_memory
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`size_in_bytes`**: The size, in bytes, of the object to be allocated.
+  * **`allocated_memory`**: A pointer to the block of allocated memory for the
+    Fortran object. The compiler is responsible for associating the Fortran
+    object with this memory, and initializing it if necessary.
+
+##### `prif_deallocate`
+
+* **Description**: This procedure releases memory previously allocated for all
+  of the coarrays associated with the handles in `coarray_handles`. This means
+  that any local objects associated with this memory become invalid. The
+  compiler will insert calls to this procedure when exiting a local scope where
+  implicit deallocation of a coarray is mandated by the standard and when a
+  coarray is explicitly deallocated through a `deallocate-stmt` in the source
+  code.
+  This call is collective over the current team, and the provided list of handles
+  must denote corresponding coarrays (in the same order on every image) that
+  were allocated by the current team using `prif_allocate` and not yet deallocated.
+  It will start with a synchronization over the current team, and then the final subroutine
+  for each coarray (if any) will be called. A synchronization will also occur
+  before control is returned from this procedure, after all deallocation has been
+  completed.
+* **Procedure Interface**:
+```
+subroutine prif_deallocate( &
+    coarray_handles, stat, errmsg, errmsg_alloc)
+  type(prif_coarray_handle), intent(in) :: coarray_handles(:)
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+* **Argument descriptions**:
+  * **`coarray_handles`**: Is an array of all of the handles for the coarrays
+    that shall be deallocated.
+
+##### `prif_deallocate_non_symmetric`
+
+* **Description**: This procedure releases memory previously allocated by a call
+  to `prif_allocate_non_symmetric`.
+* **Procedure Interface**:
+```
+subroutine prif_deallocate_non_symmetric( &
+    mem, stat, errmsg, errmsg_alloc)
+  type(c_ptr), intent(in) :: mem
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`mem`**: Pointer to the block of memory to be released.
+
+##### `prif_alias_create`
+
+* **Description**: Create a new coarray handle for an existing coarray, such as
+  in a [`prif_change_team`](#prif_change_team) or to pass to a coarray dummy
+  argument (especially in the case that the cobounds are different)
+* **Procedure Interface**:
+```
+subroutine prif_alias_create( &
+    source_handle, alias_co_lbounds, alias_co_ubounds, alias_handle)
+  type(prif_coarray_handle), intent(in) :: source_handle
+  integer(c_intmax_t), intent(in) :: alias_co_lbounds(:)
+  integer(c_intmax_t), intent(in) :: alias_co_ubounds(:)
+  type(prif_coarray_handle), intent(out) :: alias_handle
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`source_handle`**: a handle (which may itself be an alias) to the existing
+    coarray for which an alias is to be created
+  * **`alias_co_lbounds` and `alias_co_ubounds`**: the cobounds to be used for
+    the new alias
+  * **`alias_handle`**: a new alias to the existing coarray
+
+##### `prif_alias_destroy`
+
+* **Description**: Delete an alias to a coarray
+* **Procedure Interface**:
+```
+subroutine prif_alias_destroy(alias_handle)
+  type(prif_coarray_handle), intent(in) :: alias_handle
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`alias_handle`**: the alias to be destroyed
+
+##### `move_alloc`
+
+This is not provided by PRIF, but should be easily implemented through
+manipulation of `prif_coarray_handle`s. Note that calls to
+`prif_set_context_data` will likely be required as part of the operation. Note
+that `move_alloc` with coarray arguments is an image control statement that
+requires synchronization, so the compiler should likely insert call(s) to
+`prif_sync_all` as part of the implementation.
+
+#### Queries
+
+##### `prif_set_context_data`
+
+* **Description**: This procedure stores a `c_ptr` associated with a coarray
+  handle for future retrieval. A typical usage would be to store a reference
+  to the actual variable whose allocation status must be changed in the case
+  that the coarray is deallocated.
+* **Procedure Interface**:
+```
+subroutine prif_set_context_data(coarray_handle, context_data)
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  type(c_ptr), intent(in) :: context_data
+end subroutine
+```
+
+##### `prif_get_context_data`
+
+* **Description**: This procedure returns the `c_ptr` provided in the most
+  recent call to [`prif_set_context_data`](#prif_set_context_data) with the
+  same coarray handle
+* **Procedure Interface**:
+```
+subroutine prif_get_context_data(coarray_handle, context_data)
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  type(c_ptr), intent(out) :: context_data
+end subroutine
+```
+
+##### `prif_base_pointer`
+
+* **Description**: This procedure returns a C pointer value referencing the base of the
+  coarray elements on a given image and may be used in conjunction with
+  various communication operations. Pointer arithmetic operations may be
+  performed with the value and the results provided as input to the
+  `get/put_*raw` or atomic procedures (none of which are guaranteed to perform
+  validity checks, e.g., to detect out-of-bounds access violations).
+  It is not valid to dereference the produced pointer value
+  or the result of any operations performed with it on any image except for
+  the identified image.
+* **Procedure Interface**:
+```
+subroutine prif_base_pointer( &
+    coarray_handle, coindices, team, team_number, ptr)
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_intmax_t), intent(in) :: coindices(:)
+  type(prif_team_type), optional, intent(in) :: team
+  integer(c_intmax_t), optional, intent(in) :: team_number
+  integer(c_intptr_t), intent(out) :: ptr
+end subroutine
+```
+
+##### `prif_local_data_size`
+
+* **Description**: This procedure returns the size of the coarray data associated
+  with the current image. This will be equal to the following expression of the
+  arguments provided to [`prif_allocate`](#prif_allocate) at the time that the
+  coarray was allocated; `element_length * product(ubounds-lbounds+1)`
+* **Procedure Interface**:
+```
+subroutine prif_local_data_size(coarray_handle, data_size)
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(out) :: data_size
+end subroutine
+```
+
+##### `prif_lcobound`
+
+* **Description**: returns the lower cobound(s) of the coarray referred to by
+  the coarray_handle. It is the compiler's responsibility to convert to a
+  different kind if the `kind` argument appears.
+* **Procedure Interface**:
+```
+interface prif_lcobound
+  subroutine prif_lcobound_with_dim(coarray_handle, dim, lcobound)
+    type(prif_coarray_handle), intent(in) :: coarray_handle
+    integer(c_int), intent(in) :: dim
+    integer(c_intmax_t), intent(out):: lcobound
+  end subroutine
+  subroutine prif_lcobound_no_dim(coarray_handle, lcobounds)
+    type(prif_coarray_handle), intent(in) :: coarray_handle
+    integer(c_intmax_t), intent(out) :: lcobounds(:)
+  end subroutine
+end interface
+```
+* **Further argument descriptions**:
+  * **`dim`**: which codimension of the coarray to report the lower cobound of
+  * **`lcobound`**: the lower cobound of the given dimension
+  * **`lcobounds`**: an array of the size of the corank of the coarray, returns
+    the lower cobounds of the given coarray
+
+##### `prif_ucobound`
+
+* **Description**: returns the upper cobound(s) of the coarray referred to by
+  the coarray_handle. It is the compiler's responsibility to convert to a
+  different kind if the `kind` argument appears.
+* **Procedure Interface**:
+```
+interface prif_ucobound
+  subroutine prif_ucobound_with_dim(coarray_handle, dim, ucobound)
+    type(prif_coarray_handle), intent(in) :: coarray_handle
+    integer(c_int), intent(in) :: dim
+    integer(c_intmax_t), intent(out):: ucobound
+  end subroutine
+  subroutine prif_ucobound_no_dim(coarray_handle, ucobounds)
+    type(prif_coarray_handle), intent(in) :: coarray_handle
+    integer(c_intmax_t), intent(out) :: ucobounds(:)
+  end subroutine
+end interface
+```
+* **Further argument descriptions**:
+  * **`dim`**: which codimension of the coarray to report the upper cobound of
+  * **`ucobound`**: the upper cobound of the given dimension
+  * **`ucobounds`**: an array of the size of the corank of the coarray, returns
+    the upper cobounds of the given coarray
+
+##### `prif_coshape`
+
+* **Description**:
+* **Procedure Interface**:
+```
+subroutine prif_coshape(coarray_handle, sizes)
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(out) :: sizes(:)
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`sizes`**: an array of the size of the corank of the coarray, returns the
+    difference between the upper and lower cobounds + 1
+
+##### `prif_image_index`
+
+* **Description**: returns the index of the image identified by the coindices
+  provided in the `sub` argument with the given coarray on the identified team
+  or the current team if no team is identified
+* **Procedure Interface**:
+```
+subroutine prif_image_index( &
+    coarray_handle, sub, team, team_number, image_index)
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_intmax_t), intent(in) :: sub(:)
+  type(prif_team_type), intent(in), optional :: team
+  integer(c_int), intent(in), optional :: team_number
+  integer(c_int), intent(out) :: image_index
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`team` and `team_number`**: optional arguments that specify a team. They
+    shall not both be present in the same call.
+  * **`sub`**: A list of integers that identify a specific image in the
+    identified or current team when interpreted as coindices for the provided
+    coarray.
+
+#### Access
+
+Coarray accesses will maintain serial dependencies for the issuing image. Any
+data access ordering between images is defined only with respect to ordered
+segments. Note that for put operations, "local completion" means that the provided
+arguments are no longer needed (e.g. their memory can be freed once the procedure
+has returned).
+
+##### Common Arguments
+
+* **`notify_ptr`**: optional pointer on the identified image to the notify
+  variable that should be updated on completion of the put operation. The
+  referenced variable shall be of type `prif_notify_type`. If this
+  argument is not present, no notification is performed.
+
+##### `prif_put`
+
+* **Description**: This procedure assigns to the elements of a coarray, when the elements to be
+  assigned to are contiguous in linear memory on both sides. 
+  The compiler can use this to implement assignment to a `coindexed-object`. 
+  It need not call this procedure when the coarray reference is not a `coindexed-object`. 
+  This procedure blocks on local completion.
+* **Procedure Interface**:
+```
+subroutine prif_put( &
+    coarray_handle, coindices, value, first_element_addr, &
+    team, team_number, notify_ptr, stat, errmsg, errmsg_alloc)
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_intmax_t), intent(in) :: coindices(:)
+  type(*), dimension(..), intent(in), contiguous :: value
+  type(c_ptr), intent(in) :: first_element_addr
+  type(prif_team_type), optional, intent(in) :: team
+  integer(c_intmax_t), optional, intent(in) :: team_number
+  integer(c_intptr_t), optional, intent(in) :: notify_ptr
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`first_element_addr`**: The address of the local data in the coarray
+    corresponding to the first element to be assigned to on the identified image
+
+##### `prif_put_raw`
+
+* **Description**: Assign to `size` number of bytes on given image, starting at
+  remote pointer, copying from local_buffer.
+* **Procedure Interface**:
+```
+subroutine prif_put_raw( &
+    image_num, local_buffer, remote_ptr, notify_ptr, size, &
+    stat, errmsg, errmsg_alloc)
+  integer(c_int), intent(in) :: image_num
+  type(c_ptr), intent(in) :: local_buffer
+  integer(c_intptr_t), intent(in) :: remote_ptr
+  integer(c_intptr_t), optional, intent(in) :: notify_ptr
+  integer(c_size_t), intent(in) :: size
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`image_num`**: identifies the image to be written to in the initial team
+  * **`local_buffer`**: pointer to the contiguous local data which should be copied to the
+    identified image. 
+  * **`remote_ptr`**: pointer to where on the identified image the data should be written
+  * **`size`**: how much data is to be transferred in bytes
+
+##### `prif_put_raw_strided`
+
+* **Description**: Assign to memory on given image, starting at
+  remote pointer, copying from local_buffer, progressing through local_buffer
+  in local_buffer_stride increments and through remote memory in remote_ptr_stride
+  increments, transferring extent number of elements in each dimension.
+* **Procedure Interface**:
+```
+subroutine prif_put_raw_strided( &
+    image_num, local_buffer, remote_ptr, element_size, extent, &
+    remote_ptr_stride, local_buffer_stride, notify_ptr, &
+    stat, errmsg, errmsg_alloc)
+  integer(c_int), intent(in) :: image_num
+  type(c_ptr), intent(in) :: local_buffer
+  integer(c_intptr_t), intent(in) :: remote_ptr
+  integer(c_size_t), intent(in) :: element_size
+  integer(c_size_t), intent(in) :: extent(:)
+  integer(c_ptrdiff_t), intent(in) :: remote_ptr_stride(:)
+  integer(c_ptrdiff_t), intent(in) :: local_buffer_stride(:)
+  integer(c_intptr_t), optional, intent(in) :: notify_ptr
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+* **Further argument descriptions**:
+  * `remote_ptr_stride`, `local_buffer_stride` and `extent` must each have size
+    equal to the rank of the referenced coarray.
+  * **`image_num`**: identifies the image to be written to in the initial team
+  * **`local_buffer`**: pointer to the local data which should be copied to the
+    identified image.
+  * **`remote_ptr`**: pointer to where on the identified image the data should be written
+  * **`element_size`**: The size of each element in bytes
+  * **`extent`**: How many elements in each dimension should be transferred
+  * **`remote_ptr_stride`**: The stride (in units of bytes) between elements in
+    each dimension on the specified image. Each component of stride may
+    independently be positive or negative, but (together with `extent`) must
+    specify a region of distinct (non-overlapping) elements. The striding starts
+    at the `remote_ptr`.
+  * **`local_buffer_stride`**: The stride between elements in each dimension in
+    the local buffer. Each component of stride may independently be positive or
+    negative, but (together with `extent`) must specify a region of distinct
+    (non-overlapping) elements. The striding starts at the `local_buffer`.
+
+##### `prif_get`
+
+* **Description**: This procedure fetches data in a coarray from a specified image,
+  when the elements are contiguous in linear memory on both sides.
+  The compiler can use this to implement reads from a `coindexed-object`. 
+  It need not call this procedure when the coarray reference is not a `coindexed-object`. 
+  This procedure blocks until the requested data has been successfully assigned
+  to the `value` argument.
+* **Procedure Interface**:
+```
+subroutine prif_get( &
+    coarray_handle, coindices, first_element_addr, value, team, team_number, &
+    stat, errmsg, errmsg_alloc)
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_intmax_t), intent(in) :: coindices(:)
+  type(c_ptr), intent(in) :: first_element_addr
+  type(*), dimension(..), intent(out), contiguous :: value
+  type(prif_team_type), optional, intent(in) :: team
+  integer(c_intmax_t), optional, intent(in) :: team_number
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`first_element_addr`**: The address of the local data in the coarray
+    corresponding to the first element to be fetched from the identified image
+
+##### `prif_get_raw`
+
+* **Description**: Fetch `size` number of contiguous bytes from given image, starting at
+  remote pointer, copying into local_buffer.
+* **Procedure Interface**:
+```
+subroutine prif_get_raw( &
+    image_num, local_buffer, remote_ptr, size, &
+    stat, errmsg, errmsg_alloc)
+  integer(c_int), intent(in) :: image_num
+  type(c_ptr), intent(in) :: local_buffer
+  integer(c_intptr_t), intent(in) :: remote_ptr
+  integer(c_size_t), intent(in) :: size
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`image_num`**: identifies the image from which the data should be fetched
+    in the initial team
+  * **`local_buffer`**: pointer to the contiguous local memory into which the retrieved
+    data should be written
+  * **`remote_ptr`**: pointer to where on the identified image the data begins
+  * **`size`**: how much data is to be transferred in bytes
+
+##### `prif_get_raw_strided`
+
+* **Description**: Copy from given image, starting at remote pointer, writing
+  into local_buffer, progressing through local_buffer in local_buffer_stride
+  increments and through remote memory in remote_ptr_stride
+  increments, transferring extent number of elements in each dimension.
+* **Procedure Interface**:
+```
+subroutine prif_get_raw_strided( &
+    image_num, local_buffer, remote_ptr, element_size, extent, &
+    remote_ptr_stride, local_buffer_stride, &
+    stat, errmsg, errmsg_alloc)
+  integer(c_int), intent(in) :: image_num
+  type(c_ptr), intent(in) :: local_buffer
+  integer(c_intptr_t), intent(in) :: remote_ptr
+  integer(c_size_t), intent(in) :: element_size
+  integer(c_size_t), intent(in) :: extent(:)
+  integer(c_ptrdiff_t), intent(in) :: remote_ptr_stride(:)
+  integer(c_ptrdiff_t), intent(in) :: local_buffer_stride(:)
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+* **Further argument descriptions**:
+  * `remote_ptr_stride`, `local_buffer_stride` and `extent` must each have size
+    equal to the rank of the referenced coarray.
+  * **`image_num`**: identifies the image from which the data should be fetched
+    in the initial team
+  * **`local_buffer`**: pointer to the local memory into which the retrieved
+    data should be written
+  * **`remote_ptr`**: pointer to where on the identified image the data begins
+  * **`element_size`**: The size of each element in bytes
+  * **`extent`**: How many elements in each dimension should be transferred
+  * **`remote_ptr_stride`**: The stride (in units of bytes) between elements in
+    each dimension on the specified image. Each component of stride may
+    independently be positive or negative, but (together with `extent`) must
+    specify a region of distinct (non-overlapping) elements. The striding starts
+    at the `remote_ptr`.
+  * **`local_buffer_stride`**: The stride between elements in each dimension in
+    the local buffer. Each component of stride may independently be positive or
+    negative, but (together with `extent`) must specify a region of distinct
+    (non-overlapping) elements. The striding starts at the `local_buffer`.
+
+### Synchronization
+
+#### `prif_sync_memory`
+
+* **Description**: Ends one segment and begins another, waiting on pending
+  communication operations with other images.
+* **Procedure Interface**:
+```
+subroutine prif_sync_memory(stat, errmsg, errmsg_alloc)
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+
+#### `prif_sync_all`
+
+* **Description**: Performs a synchronization of all images in the current team.
+* **Procedure Interface**:
+```
+subroutine prif_sync_all(stat, errmsg, errmsg_alloc)
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+
+#### `prif_sync_images`
+
+* **Description**: Performs a synchronization with the listed images.
+* **Procedure Interface**:
+```
+subroutine prif_sync_images(image_set, stat, errmsg, errmsg_alloc)
+  integer(c_int), intent(in), optional :: image_set(:)
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`image_set`**: The image inidices of the images in the current team with
+    which to synchronize. Note, if a scalar appears, the compiler should pass
+    its value as a size 1 array, and if an asterisk (`*`) appears, the compiler
+    should not pass `image_set`.
+
+#### `prif_sync_team`
+
+* **Description**: Performs a synchronization with the images of the identified
+  team.
+* **Procedure Interface**:
+```
+subroutine prif_sync_team(team, stat, errmsg, errmsg_alloc)
+  type(prif_team_type), intent(in) :: team
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`team`**: Identifies the team to synchronize.
+
+#### `prif_lock`
+
+* **Description**: Waits until the identified lock variable is unlocked
+  and then locks it if the `acquired_lock` argument is not present. Otherwise it
+  sets the `acquired_lock` argument to `.false.` if the identified lock variable
+  was locked, or locks the identified lock variable and sets the `acquired_lock`
+  argument to `.true.`. Note that if the identified lock variable was already
+  locked by the current image an error condition occurs.
+* **Procedure Interface**:
+```
+subroutine prif_lock( &
+    image_num, lock_var_ptr, acquired_lock, &
+    stat, errmsg, errmsg_alloc)
+  integer(c_int), intent(in) :: image_num
+  integer(c_intptr_t), intent(in) :: lock_var_ptr
+  logical(c_bool), intent(out), optional :: acquired_lock
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`image_num`**: the image index in the initial team for the lock variable
+    to be locked
+  * **`lock_var_ptr`**: a pointer to the base address of the lock variable to
+    be locked on the identified image, typically obtained from a call to
+    `prif_base_pointer`
+  * **`acquired_lock`**: if present is set to `.true.` if the lock was locked
+    by the current image, or set to `.false.` otherwise
+
+#### `prif_unlock`
+
+* **Description**: Unlocks the identified lock variable. Note that if the
+  identified lock variable was not locked by the current image an error
+  condition occurs.
+* **Procedure Interface**:
+```
+subroutine prif_unlock( &
+    image_num, lock_var_ptr, stat, errmsg, errmsg_alloc)
+  integer(c_int), intent(in) :: image_num
+  integer(c_intptr_t), intent(in) :: lock_var_ptr
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`image_num`**: the image index in the initial team for the lock variable
+    to be unlocked
+  * **`lock_var_ptr`**: a pointer to the base address of the lock variable to
+    be unlocked on the identified image, typically obtained from a call to
+    `prif_base_pointer`
+
+#### `prif_critical`
+
+* **Description**: The compiler shall define a coarray, and establish (allocate)
+  it in the initial team, that shall only be used to begin and end the critical
+  block. An efficient implementation will likely define one for each critical
+  block. The coarray shall be a scalar coarray of type `prif_critical_type` and
+  the associated coarray handle shall be passed to this procedure. This
+  procedure waits until any other image which has executed this procedure with
+  a corresponding coarray handle has subsequently executed `prif_end_critical`
+  with the same coarray handle an identical number of times.
+* **Procedure Interface**:
+```
+subroutine prif_critical( &
+    critical_coarray, stat, errmsg, errmsg_alloc)
+  type(prif_coarray_handle), intent(in) :: critical_coarray
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`critical_coarray`**: the handle for the `prif_critical_type` coarray
+    associated with a given critical construct
+
+#### `prif_end_critical`
+
+* **Description**: Completes execution of the critical construct associated with
+  the provided coarray handle.
+* **Procedure Interface**:
+```
+subroutine prif_end_critical(critical_coarray)
+  type(prif_coarray_handle), intent(in) :: critical_coarray
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`critical_coarray`**: the handle for the `prif_critical_type` coarray
+    associated with a given critical construct
+
+### Events and Notifications
+
+#### `prif_event_post`
+
+* **Description**: Atomically increment the count of the event variable by one.
+* **Procedure Interface**:
+```
+subroutine prif_event_post( &
+    image_num, event_var_ptr, stat, errmsg, errmsg_alloc)
+  integer(c_int), intent(in) :: image_num
+  integer(c_intptr_t), intent(in) :: event_var_ptr
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`image_num`**: the image index in the initial team for the event variable
+    to be incremented
+  * **`event_var_ptr`**: a pointer to the base address of the event variable to
+    be incremented on the identified image, typically obtained from a call to
+    `prif_base_pointer`
+
+#### `prif_event_wait`
+
+* **Description**: Wait until the count of the provided event variable is greater
+  than or equal to `until_count`, and then atomically decrement the count by that
+  value. If `until_count` is not present it has the value 1.
+* **Procedure Interface**:
+```
+subroutine prif_event_wait( &
+    event_var_ptr, until_count, stat, errmsg, errmsg_alloc)
+  integer(c_ptr), intent(in) :: event_var_ptr
+  integer(c_intmax_t), intent(in), optional :: until_count
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`event_var_ptr`**: a pointer to the event variable to be waited on
+  * **`until_count`**: the count of the given event variable to be waited for.
+    Has the value 1 if not provided.
+
+#### `prif_event_query`
+
+* **Description**: Query the count of an event.
+* **Procedure Interface**:
+```
+subroutine prif_event_query(event_var_ptr, count, stat)
+  integer(c_ptr), intent(in) :: event_var_ptr
+  integer(c_intmax_t), intent(out) :: count
+  integer(c_int), intent(out), optional :: stat
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`event_var_ptr`**: a pointer to the event variable to be queried
+  * **`count`**: the current count of the given event variable.
+
+#### `prif_notify_wait`
+
+* **Description**: Wait on notification of a put operation
+* **Procedure Interface**:
+  ```
+    subroutine prif_notify_wait( &
+        notify_var_ptr, until_count, stat, errmsg, errmsg_alloc)
+      integer(c_ptr), intent(in) :: notify_var_ptr
+      integer(c_intmax_t), intent(in), optional :: until_count
+      integer(c_int), intent(out), optional :: stat
+      character(len=*), intent(inout), optional :: errmsg
+      character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+    end subroutine
+  ```
+* **Further argument descriptions**:
+  * **`notify_var_ptr`**: a pointer to the notify variable to be waited on. The
+  referenced variable shall be of type `prif_notify_type`.
+  * **`until_count`**: the count of the given notify variable to be waited for.
+    Has the value 1 if not provided.
+
+### Teams
+
+Team creation forms a tree structure, where a given team may create multiple
+child teams. The initial team is created by the `prif_init` procedure. Each
+subsequently created team's parent team is then the current team. Team
+membership is thus strictly hierarchical, following a single path along the
+tree formed by team creation.
+
+#### `prif_form_team`
+
+* **Description**: Create teams. Each image receives a team value denoting the
+  newly created team containing all images in the current team which specify the
+  same value for `team_number`.
+* **Procedure Interface**:
+```
+subroutine prif_form_team( &
+    team_number, team, new_index, stat, errmsg, errmsg_alloc)
+  integer(c_intmax_t), intent(in) :: team_number
+  type(prif_team_type), intent(out) :: team
+  integer(c_int), intent(in), optional :: new_index
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`new_index`**: the index that the current image will have in its new team
+
+#### `prif_get_team`
+
+* **Description**: Get the team value for the current or an ancestor team. It
+  returns the current team if `level` is not present or has the value
+  `PRIF_CURRENT_TEAM`, the parent team if `level` is present with the
+  value `PRIF_PARENT_TEAM`, or the initial team if `level` is present with the value
+  `PRIF_INITIAL_TEAM`
+* **Procedure Interface**:
+```
+subroutine prif_get_team(level, team)
+  integer(c_int), intent(in), optional :: level
+  type(prif_team_type), intent(out) :: team
+end subroutine
+```
+* **Further argument descriptions**:
+  * **`level`**: identify which team value to be returned
+
+#### `prif_team_number`
+
+* **Description**: Return the `team_number` that was specified in the call to
+  `prif_form_team` for the specified team, or -1 if the team is the initial
+  team. If `team` is not present, the current team is used.
+* **Procedure Interface**:
+```
+subroutine prif_team_number(team, team_number)
+  type(prif_team_type), intent(in), optional :: team
+  integer(c_intmax_t), intent(out) :: team_number
+end subroutine
+```
+
+#### `prif_change_team`
+
+* **Description**: changes the current team to the specified team. For any
+  associate names specified in the `CHANGE TEAM` statement the compiler should
+  follow a call to this procedure with calls to `prif_alias_create` to create
+  the alias coarray handle, and associate any non-coindexed references to the
+  associate name within the `CHANGE TEAM` construct with the selector.
+* **Procedure Interface**:
+```
+subroutine prif_change_team(team, stat, errmsg, errmsg_alloc)
+  type(prif_team_type), intent(in) :: team
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+
+#### `prif_end_team`
+
+* **Description**: Changes the current team to the parent team. During the
+  execution of `prif_end_team`, the PRIF implementation will deallocate any coarrays allocated during the
+  change team construct. Prior to invoking `prif_end_team`, the compiler is
+  responsible for invoking `prif_alias_destroy` for any `prif_coarray_handle`
+  handles created as part of the `change team` statement.
+* **Procedure Interface**:
+```
+subroutine prif_end_team(stat, errmsg, errmsg_alloc)
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+
+### Collectives
+
+#### Common arguments
+
+* **`a`**
+  * Argument for all the collective subroutines: [`prif_co_broadcast`](#prif_co_broadcast),
+    [`prif_co_max`](#prif_co_max), [`prif_co_min`](#prif_co_min),
+    [`prif_co_reduce`](#prif_co_reduce), [`prif_co_sum`](#prif_co_sum),
+  * may be any type for `co_broadcast` or `co_reduce`, any numeric for `co_sum`,
+    and integer, real, or character for `co_min` or `co_max`
+  * is always `intent(inout)`
+  * for `co_max`, `co_min`, `co_reduce`, `co_sum` it is assigned the value
+    computed by the collective operation, if no error conditions occurs and if
+    `result_image` is absent, or the executing image is the one identified by
+    `result_image`, otherwise `a` becomes undefined
+  * for `co_broadcast`, the value of the argument on the `source_image` is
+    assigned to the `a` argument on all other images
+
+* **`source_image` or `result_image`**
+  * These arguments are of type `integer(c_int)`, to minimize the frequency
+    that integer conversions will be needed.
+
+#### `prif_co_broadcast`
+
+* **Description**: Broadcast value to images
+* **Procedure Interface**:
+```
+subroutine prif_co_broadcast( &
+    a, source_image, stat, errmsg, errmsg_alloc)
+  type(*), intent(inout), contiguous, target :: a(..)
+  integer(c_int), intent(in) :: source_image
+  integer(c_int), optional, intent(out) :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+
+#### `prif_co_max`
+
+* **Description**: Compute maximum value across images
+* **Procedure Interface**:
+```
+subroutine prif_co_max( &
+    a, result_image, stat, errmsg, errmsg_alloc)
+  type(*), intent(inout), contiguous, target :: a(..)
+  integer(c_int), intent(in), optional :: result_image
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+
+#### `prif_co_min`
+
+* **Description**: Compute minimum value across images
+* **Procedure Interface**:
+```
+subroutine prif_co_min( &
+    a, result_image, stat, errmsg, errmsg_alloc)
+  type(*), intent(inout), contiguous, target :: a(..)
+  integer(c_int), intent(in), optional :: result_image
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+
+#### `prif_co_reduce`
+
+* **Description**: Generalized reduction across images
+* **Procedure Interface**:
+```
+subroutine prif_co_reduce( &
+    a, operation, result_image, stat, errmsg, errmsg_alloc)
+  type(*), intent(inout), contiguous, target :: a(..)
+  type(c_funptr), value :: operation
+  integer(c_int), intent(in), optional :: result_image
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+
+#### `prif_co_sum`
+
+* **Description**: Compute sum across images
+* **Procedure Interface**:
+```
+subroutine prif_co_sum( &
+    a, result_image, stat, errmsg, errmsg_alloc)
+  type(*), intent(inout), contiguous, target :: a(..)
+  integer(c_int), intent(in), optional :: result_image
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+
+### Atomic Memory Operation
+
+All atomic operations are blocking operations.
+
+#### Common arguments
+
+* **`atom_remote_ptr`**
+  * Argument for all of the atomic subroutines
+  * is type `integer(c_intptr_t)`
+  * is the location of the atomic variable on the identified image to be
+    operated on
+  * it is the responsibility of the compiler to perform the necessary operations
+    on the coarray or coindexed actual argument to get the relevant remote pointer
+* **`image_num`**
+  * identifies the image on which the atomic operation is to be performed
+  * is the image index in the initial team
+
+#### Non-fetching Atomic Operations
+
+Perform specified operation on a variable in a coarray atomically.
+
+##### Common argument
+
+* **`value`**: value to perform the operation with
+
+##### `prif_atomic_add`, Addition
+
+```
+subroutine prif_atomic_add(atom_remote_ptr, image_num, value, stat)
+  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+  integer(c_int), intent(in) :: image_num
+  integer(atomic_int_kind), intent(in) :: value
+  integer(c_int), intent(out), optional :: stat
+end subroutine
+```
+
+##### `prif_atomic_and`, Bitwise And
+
+```
+subroutine prif_atomic_and(atom_remote_ptr, image_num, value, stat)
+  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+  integer(c_int), intent(in) :: image_num
+  integer(atomic_int_kind), intent(in) :: value
+  integer(c_int), intent(out), optional :: stat
+end subroutine
+```
+
+##### `prif_atomic_or`, Bitwise Or
+
+```
+subroutine prif_atomic_or(atom_remote_ptr, image_num, value, stat)
+  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+  integer(c_int), intent(in) :: image_num
+  integer(atomic_int_kind), intent(in) :: value
+  integer(c_int), intent(out), optional :: stat
+end subroutine
+```
+
+##### `prif_atomic_xor`, Bitwise Xor
+
+```
+subroutine prif_atomic_xor(atom_remote_ptr, image_num, value, stat)
+  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+  integer(c_int), intent(in) :: image_num
+  integer(atomic_int_kind), intent(in) :: value
+  integer(c_int), intent(out), optional :: stat
+end subroutine
+```
+
+#### Atomic Fetch Operations
+
+Perform specified operation on a variable in a coarray atomically and save its
+original value.
+
+##### Common arguments
+
+* **`value`**: value to perform the operation with
+* **`old`**: is set to the initial value of the atomic variable
+
+##### `prif_atomic_fetch_add`, Addition
+
+```
+subroutine prif_atomic_fetch_add( &
+    atom_remote_ptr, image_num, value, old, stat)
+  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+  integer(c_int), intent(in) :: image_num
+  integer(atomic_int_kind), intent(in) :: value
+  integer(atomic_int_kind), intent(out) :: old
+  integer(c_int), intent(out), optional :: stat
+end subroutine
+```
+
+##### `prif_atomic_fetch_and`, Bitwise And
+
+```
+subroutine prif_atomic_fetch_and( &
+    atom_remote_ptr, image_num, value, old, stat)
+  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+  integer(c_int), intent(in) :: image_num
+  integer(atomic_int_kind), intent(in) :: value
+  integer(atomic_int_kind), intent(out) :: old
+  integer(c_int), intent(out), optional :: stat
+end subroutine
+```
+
+##### `prif_atomic_fetch_or`, Bitwise Or
+
+```
+subroutine prif_atomic_fetch_or( &
+    atom_remote_ptr, image_num, value, old, stat)
+  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+  integer(c_int), intent(in) :: image_num
+  integer(atomic_int_kind), intent(in) :: value
+  integer(atomic_int_kind), intent(out) :: old
+  integer(c_int), intent(out), optional :: stat
+end subroutine
+```
+
+##### `prif_atomic_fetch_xor`, Bitwise Xor
+
+```
+subroutine prif_atomic_fetch_xor( &
+    atom_remote_ptr, image_num, value, old, stat)
+  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+  integer(c_int), intent(in) :: image_num
+  integer(atomic_int_kind), intent(in) :: value
+  integer(atomic_int_kind), intent(out) :: old
+  integer(c_int), intent(out), optional :: stat
+end subroutine
+```
+
+#### Atomic Access
+
+Atomically set or retrieve the value of an atomic variable in a coarray.
+
+##### Common argument
+
+* **`value`**: value to which the variable shall be set, or retrieved from the
+  variable
+
+##### `prif_atomic_define`, set variable's value
+
+```
+interface prif_atomic_define
+  subroutine prif_atomic_define_int( &
+      atom_remote_ptr, image_num, value, stat)
+    integer(c_intptr_t), intent(in) :: atom_remote_ptr
+    integer(c_int), intent(in) :: image_num
+    integer(atomic_int_kind), intent(in) :: value
+    integer(c_int), intent(out), optional :: stat
+  end subroutine
+
+  subroutine prif_atomic_define_logical( &
+      atom_remote_ptr, image_num, value, stat)
+    integer(c_intptr_t), intent(in) :: atom_remote_ptr
+    integer(c_int), intent(in) :: image_num
+    logical(atomic_logical_kind), intent(in) :: value
+    integer(c_int), intent(out), optional :: stat
+  end subroutine
+end interface
+```
+
+##### `prif_atomic_ref`, retrieve variable's value
+
+```
+interface prif_atomic_ref
+  subroutine prif_atomic_ref_int( &
+      value, atom_remote_ptr, image_num, stat)
+    integer(atomic_int_kind), intent(out) :: value
+    integer(c_intptr_t), intent(in) :: atom_remote_ptr
+    integer(c_int), intent(in) :: image_num
+    integer(c_int), intent(out), optional :: stat
+  end subroutine
+
+  subroutine prif_atomic_ref_logical( &
+      value, atom_remote_ptr, image_num, stat)
+    logical(atomic_logical_kind), intent(out) :: value
+    integer(c_intptr_t), intent(in) :: atom_remote_ptr
+    integer(c_int), intent(in) :: image_num
+    integer(c_int), intent(out), optional :: stat
+  end subroutine
+end interface
+```
+
+##### `prif_atomic_cas`, Compare and Swap
+
+If the value of the atomic variable is equal to the value of the `compare`
+argument, set it to the value of the `new` argument. The `old` argument is set
+to the initial value of the atomic variable.
+
+```
+interface prif_atomic_cas
+  subroutine prif_atomic_cas_int( &
+      atom_remote_ptr, image_num, old, compare, new, stat)
+    integer(c_intptr_t), intent(in) :: atom_remote_ptr
+    integer(c_int), intent(in) :: image_num
+    integer(atomic_int_kind), intent(out) :: old
+    integer(atomic_int_kind), intent(in) :: compare
+    integer(atomic_int_kind), intent(in) :: new
+    integer(c_int), intent(out), optional :: stat
+  end subroutine
+
+  subroutine prif_atomic_cas_logical( &
+      atom_remote_ptr, image_num, old, compare, new, stat)
+    integer(c_intptr_t), intent(in) :: atom_remote_ptr
+    integer(c_int), intent(in) :: image_num
+    logical(atomic_logical_kind), intent(out) :: old
+    logical(atomic_logical_kind), intent(in) :: compare
+    logical(atomic_logical_kind), intent(in) :: new
+    integer(c_int), intent(out), optional :: stat
+  end subroutine
+end interface
+```
+* **Further argument descriptions**:
+  * **`old`**: is set to the initial value of the atomic variable
+  * **`compare`**: the value with which to compare the atomic variable
+  * **`new`**: the value to set the atomic variable too if it is initially equal
+    to the `compare` argument
+
+
+# Future Work
+
+At present all communication operations are semantically blocking on at least
+local completion. We acknowledge that this prohibits certain types of static
+optimization, namely the explicit overlap of communication with computation. In
+the future we intend to develop split-phased/asynchronous versions of various
+communication operations to enable more opportunities for static optimization of
+communication.
+
+# Acknowledgments
+
+This research is supported by the Exascale Computing Project (17-SC-20-SC), a
+collaborative effort of the U.S. Department of Energy Office of Science and the
+National Nuclear Security Administration
+
+This research used resources of the National Energy Research Scientific
+Computing Center (NERSC), a U.S. Department of Energy Office of Science User
+Facility located at Lawrence Berkeley National Laboratory, operated under
+Contract No. DE-AC02-05CH11231
+
+# Copyright
+
+This work is licensed under [CC BY-ND](https://creativecommons.org/licenses/by-nd/4.0/)
+
+This manuscript has been authored by authors at Lawrence Berkeley National Laboratory under Contract No.
+DE-AC02-05CH11231 with the U.S. Department of Energy. The U.S. Government retains, and the publisher,
+by accepting the article for publication, acknowledges, that the U.S. Government retains a non-exclusive,
+paid-up, irrevocable, world-wide license to publish or reproduce the published form of this manuscript, or
+allow others to do so, for U.S. Government purposes.
+
+# Legal Disclaimer
+
+This document was prepared as an account of work sponsored by the United States Government. While
+this document is believed to contain correct information, neither the United States Government nor any
+agency thereof, nor the Regents of the University of California, nor any of their employees, makes any
+warranty, express or implied, or assumes any legal responsibility for the accuracy, completeness, or usefulness
+of any information, apparatus, product, or process disclosed, or represents that its use would not infringe
+privately owned rights. Reference herein to any specific commercial product, process, or service by its trade
+name, trademark, manufacturer, or otherwise, does not necessarily constitute or imply its endorsement,
+recommendation, or favoring by the United States Government or any agency thereof, or the Regents of the
+University of California. The views and opinions of authors expressed herein do not necessarily state or reflect
+those of the United States Government or any agency thereof or the Regents of the University of California.
+
+[Caffeine]: https://go.lbl.gov/caffeine
+[GASNet-EX]: https://go.lbl.gov/gasnet
+[OpenCoarrays]: https://github.com/sourceryinstitute/opencoarrays
+[MPI]: https://www.mpi-forum.org
+[Rouson and Bonachea (2022)]: https://doi.org/10.25344/S4459B

>From 90b6d6a876e0f61326b9be1d978ca041d4f7c93e Mon Sep 17 00:00:00 2001
From: Brad Richardson <everythingfunctional at protonmail.com>
Date: Tue, 7 May 2024 08:55:00 -0500
Subject: [PATCH 2/4] Update PRIF doc to new revision

---
 flang/docs/ParallelFortranRuntime.md | 1599 ++++++++++++++------------
 1 file changed, 882 insertions(+), 717 deletions(-)

diff --git a/flang/docs/ParallelFortranRuntime.md b/flang/docs/ParallelFortranRuntime.md
index 392fefd7f927ec..fedb4b1dfdc05d 100644
--- a/flang/docs/ParallelFortranRuntime.md
+++ b/flang/docs/ParallelFortranRuntime.md
@@ -5,18 +5,18 @@
    SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 -->
-# Parallel Runtime Interface for Fortran (PRIF) Design Document, Revision 0.2
+# Parallel Runtime Interface for Fortran (PRIF) Specification, Revision 0.3
 
-Damian Rouson  
-Brad Richardson  
 Dan Bonachea  
 Katherine Rasmussen  
+Brad Richardson  
+Damian Rouson  
 Lawrence Berkeley National Laboratory, USA  
-lbl-flang at lbl.gov  
+<fortran at lbl.gov>  
 
 # Abstract
 
-This design document proposes an interface to support the parallel features of
+This document specifies an interface to support the parallel features of
 Fortran, named the Parallel Runtime Interface for Fortran (PRIF). PRIF is a
 proposed solution in which the runtime library is responsible for coarray
 allocation, deallocation and accesses, image synchronization, atomic operations,
@@ -33,55 +33,100 @@ to define a parallel runtime interface in standard Fortran syntax, which enables
 us to leverage Fortran to succinctly express various properties of the procedure
 interfaces, including argument attributes.
 
-> **WORK IN PROGRESS** This is still a draft a may continue to evolve.
-> Feedback and questions should be directed to lbl-flang at lbl.gov.
+> **WORK IN PROGRESS** This document is still a draft and may continue to evolve.    
+> Feedback and questions should be directed to: <fortran at lbl.gov>
 
-# Changelog
+\newpage
+# Change Log
 
-## Rev. 0.1
+## Revision 0.1
 
 * Identify parallel features
 * Sketch out high-level design
 * Decide on compiler vs PRIF responsibilities
 
-## Rev. 0.2 (Dec. 2023)
+## Revision 0.2 (Dec. 2023)
 
 * Change name to PRIF
 * Fill out interfaces to all PRIF provided procedures
 * Write descriptions, discussions and overviews of various features, arguments, etc.
 
-# Problem description
+## Revision 0.3 (May 2024)
+
+* `prif_(de)allocate` are renamed to `prif_(de)allocate_coarray`
+* `prif_(de)allocate_non_symmetric` are renamed to `prif_(de)allocate`
+* `prif_local_data_size` renamed to `prif_size_bytes` and
+  add a client note about the procedure
+* Update interface to `prif_base_pointer` by replacing three arguments, `coindices`,
+  `team`, and `team_number`, with one argument `image_num`. Update the semantics
+  of `prif_base_pointer`, as it is no longer responsible for resolving the coindices and
+  team information into a number that represents the image on the initial team before
+  returning the address. That is now expected to occur before the `prif_base_pointer`
+  call and passed into the `image_num` argument.
+* Add target attribute on `coarray_handles` argument to `prif_deallocate_coarray`
+* Add pointer attribute on `handle` argument to `coarray_cleanup` callback for `prif_allocate_coarray`
+* Add target attribute on `value` argument to `prif_put` and `prif_get`
+* Add new PRIF-specific constant `PRIF_STAT_OUT_OF_MEMORY`
+* Clarify that remote pointers passed to various procedures must reference storage
+  allocated using `prif_allocate_coarray` or `prif_allocate`
+* Clarify description of the `allocated_memory` argument for
+  the procedures `prif_allocate_coarray` and `prif_allocate`
+* Clarify descriptions of `event_var_ptr`, `lock_var_ptr`, and `notify_ptr`
+* Clarify descriptions for `prif_stop`, `prif_put`, `prif_get`,
+  intrinsic derived types, sections about `MOVE_ALLOC` and coarray accesses
+* Replace the phrase "local completion" with the phrase "source completion",
+  and add the new phrase to the glossary
+* Clarify that `prif_stop` should be used to initiate normal termination
+* Describe the `operation` argument to `prif_co_reduce`
+* Rename and clarify the cobounds arguments to `prif_alias_create`
+* Clarify the descriptions of `source_image`/`result_image` arguments to collective calls
+* Clarify completion semantics for atomic operations
+* Rename `coindices` argument names to `cosubscripts` to more closely correspond with
+  the terms used in the Fortran standard
+* Rename `local_buffer` and `local_buffer_stride` arg names
+  to `current_image_buffer` and `current_image_buffer_stride`
+* Update `coindexed-object` references to _coindexed-named-object_ to match
+  the term change in the most recent Fortran 2023 standard
+* Convert several explanatory sections to "Notes"
+* Add implementation note about the PRIF API being defined in Fortran
+* Add section "How to read the PRIF specification"
+* Add section "Glossary"
+* Improve description of the `final_func` arg to `prif_allocate_coarray`
+  and move some of previous description to a client note.
+
+\newpage
+# Problem Description
 
 In order to be fully Fortran 2023 compliant, a Fortran compiler needs support for
-what is commonly referred to as coarray fortran, which includes features
+what is commonly referred to as Coarray Fortran, which includes features
 related to parallelism. These features include the following statements,
 subroutines, functions, types, and kind type parameters:
 
 * **Statements:**
-  - _Synchronization:_ `sync all`, `sync images`, `sync memory`, `sync team`
-  - _Events:_ `event post`, `event wait`
-  - _Notify:_ `notify wait`
-  - _Error termination:_ `error stop`
-  - _Locks:_ `lock`, `unlock`
-  - _Failed images:_ `fail image`
-  - _Teams:_ `form team`, `change team`
-  - _Critical sections:_ `critical`, `end critical`
-* **Intrinsic functions:** `num_images`, `this_image`, `lcobound`, `ucobound`,
-  `team_number`, `get_team`, `failed_images`, `stopped_images`, `image_status`,
-  `coshape`, `image_index`
+  - _Synchronization:_ `SYNC ALL`, `SYNC IMAGES`, `SYNC MEMORY`, `SYNC TEAM`
+  - _Events:_ `EVENT POST`, `EVENT WAIT`
+  - _Notify:_ `NOTIFY WAIT`
+  - _Error termination:_ `ERROR STOP`
+  - _Locks:_ `LOCK`, `UNLOCK`
+  - _Failed images:_ `FAIL IMAGE`
+  - _Teams:_ `FORM TEAM`, `CHANGE TEAM`
+  - _Critical sections:_ `CRITICAL`, `END CRITICAL`
+* **Intrinsic functions:** `NUM_IMAGES`, `THIS_IMAGE`, `LCOBOUND`, `UCOBOUND`,
+  `TEAM_NUMBER`, `GET_TEAM`, `FAILED_IMAGES`, `STOPPED_IMAGES`, `IMAGE_STATUS`,
+  `COSHAPE`, `IMAGE_INDEX`
 * **Intrinsic subroutines:**
-  - _Collective subroutines:_ `co_sum`, `co_max`, `co_min`, `co_reduce`, `co_broadcast`
-  - _Atomic subroutines:_ `atomic_add`, `atomic_and`, `atomic_cas`,
-    `atomic_define`, `atomic_fetch_add`, `atomic_fetch_and`, `atomic_fetch_or`,
-    `atomic_fetch_xor`, `atomic_or`, `atomic_ref`, `atomic_xor`
-  - _Other subroutines:_ `event_query`
+  - _Collective subroutines:_ `CO_SUM`, `CO_MAX`, `CO_MIN`, `CO_REDUCE`, `CO_BROADCAST`
+  - _Atomic subroutines:_ `ATOMIC_ADD`, `ATOMIC_AND`, `ATOMIC_CAS`,
+    `ATOMIC_DEFINE`, `ATOMIC_FETCH_ADD`, `ATOMIC_FETCH_AND`, `ATOMIC_FETCH_OR`,
+    `ATOMIC_FETCH_XOR`, `ATOMIC_OR`, `ATOMIC_REF`, `ATOMIC_XOR`
+  - _Other subroutines:_ `EVENT_QUERY`
 * **Types, kind type parameters, and values:**
-  - _Intrinsic derived types:_ `event_type`, `team_type`, `lock_type`, `notify_type`
-  - _Atomic kind type parameters:_ `atomic_int_kind` and `atomic_logical_kind`
-  - _Values:_ `stat_failed_image`, `stat_locked`, `stat_locked_other_image`,
-    `stat_stopped_image`, `stat_unlocked`, `stat_unlocked_failed_image`
+  - _Intrinsic derived types:_ `EVENT_TYPE`, `TEAM_TYPE`, `LOCK_TYPE`, `NOTIFY_TYPE`
+  - _Atomic kind type parameters:_ `ATOMIC_INT_KIND` AND `ATOMIC_LOGICAL_KIND`
+  - _Values:_ `STAT_FAILED_IMAGE`, `STAT_LOCKED`, `STAT_LOCKED_OTHER_IMAGE`,
+    `STAT_STOPPED_IMAGE`, `STAT_UNLOCKED`, `STAT_UNLOCKED_FAILED_IMAGE`
 
-In addition to being able to support syntax related to the above features,
+In addition to supporting syntax related to the above features,
 compilers will also need to be able to handle new execution concepts such as
 image control. The image control concept affects the behaviors of some
 statements that were introduced in Fortran expressly for supporting parallel
@@ -89,23 +134,23 @@ programming, but image control also affects the behavior of some statements
 that pre-existed parallelism in standard Fortran:
 
 * **Image control statements:**
-  - _Pre-existing statements_: `allocate`, `deallocate`, `stop`, `end`,
-    a `call` referencing `move_alloc` with coarray arguments
-  - _New statements:_ `sync all`, `sync images`, `sync memory`, `sync team`,
-    `change team`, `end team`, `critical`, `end critical`, `event post`,
-    `event wait`, `form team`, `lock`, `unlock`, `notify wait`
+  - _Pre-existing statements_: `ALLOCATE`, `DEALLOCATE`, `STOP`, `END`,
+    a `CALL` to `MOVE_ALLOC` with coarray arguments
+  - _New statements:_ `SYNC ALL`, `SYNC IMAGES`, `SYNC MEMORY`, `SYNC TEAM`,
+    `CHANGE TEAM`, `END TEAM`, `CRITICAL`, `END CRITICAL`, `EVENT POST`,
+    `EVENT WAIT`, `FORM TEAM`, `LOCK`, `UNLOCK`, `NOTIFY WAIT`
 
 One consequence of the statements being categorized as image control statements
 will be the need to restrict code movement by optimizing compilers.
 
-# Proposed solution
+# Proposed Solution
 
-This design document proposes an interface to support the above features,
+This specification proposes an interface to support the above features,
 named Parallel Runtime Interface for Fortran (PRIF). By defining an
 implementation-agnostic interface, we envision facilitating the development of
 alternative parallel runtime libraries that support the same interface. One
 benefit of this approach is the ability to vary the communication substrate.
-A central aim of this document is to use a parallel runtime interface in
+A central aim of this document is to specify a parallel runtime interface in
 standard Fortran syntax, which enables us to leverage Fortran to succinctly
 express various properties of the procedure interfaces, including argument
 attributes. See [Rouson and Bonachea (2022)] for additional details.
@@ -119,12 +164,10 @@ interface, the compiler is responsible for transforming the invocation of
 Fortran-level parallel features to add procedure calls to the necessary PRIF
 procedures. Below you can find a table showing the delegation of tasks
 between the compiler and the PRIF implementation. The interface is designed for
-portability across shared and distributed memory machines, different operating
-systems, and multiple architectures. The Caffeine implementation,
-[see below](#caffeine---lbl's-implementation-of-the-parallel-runtime-interface-for-fortran),
-of the Parallel Runtime Interface for Fortran plans to support the following
-architectures: x86_64, PowerPC64, AArch64, with the possibility of supporting
-more as requested. Implementations of this interface are intended as an
+portability across shared- and distributed-memory machines, different operating
+systems, and multiple architectures. 
+
+Implementations of PRIF are intended as an
 augmentation for the compiler's own runtime library. While the interface can
 support multiple implementations, we envision needing to build the PRIF implementation
 as part of installing the compiler. The procedures and types provided
@@ -139,7 +182,7 @@ implementation. A 'X' in the "Fortran compiler" column indicates that the compil
 the primary responsibility for that task, while a 'X' in the "PRIF implementation"
 column indicates that the compiler will invoke the PRIF implementation to perform
 the task and the PRIF implementation has primary responsibility for the task's
-implementation. See the [Procedure descriptions](#procedure-descriptions)
+implementation. See the [Procedure descriptions](#prif-procedures)
 for the list of PRIF implementation procedures that the compiler will invoke.
 
 |                                                      Tasks                                                                       |  Fortran compiler  | PRIF implementation |
@@ -147,192 +190,208 @@ for the list of PRIF implementation procedures that the compiler will invoke.
 | Establish and initialize static coarrays prior to `main`                                                                         |         X          |                     |
 | Track corank of coarrays                                                                                                         |         X          |                     |
 | Track local coarrays for implicit deallocation when exiting a scope                                                              |         X          |                     |
-| Initialize a coarray with `SOURCE=` as part of allocate-stmt                                                                     |         X          |                     |
-| Provide `lock_type` coarrays for `critical-construct`s                                                                           |         X          |                     |
+| Initialize a coarray with `SOURCE=` as part of `ALLOCATE`                                                                        |         X          |                     |
+| Provide `prif_critical_type` coarrays for `CRITICAL`                                                                             |         X          |                     |
 | Provide final subroutine for all derived types that are finalizable or that have allocatable components that appear in a coarray |         X          |                     |
-| Track variable allocation status, including resulting from use of `move_alloc`                                                   |         X          |                     |
-| Track coarrays for implicit deallocation at `end-team-stmt`                                                                      |                    |          X          |
+| Track variable allocation status, including resulting from use of `MOVE_ALLOC`                                                   |         X          |                     |
+|                                                                                                                                  |                    |                     |
+| Intrinsics related to parallelism, eg. `NUM_IMAGES`, `COSHAPE`, `IMAGE_INDEX`                                                    |                    |          X          |
 | Allocate and deallocate a coarray                                                                                                |                    |          X          |
-| Reference a coindexed-object                                                                                                     |                    |          X          |
+| Reference a _coindexed-named-object_                                                                                             |                    |          X          |
+| Team statements/constructs: `FORM TEAM`, `CHANGE TEAM`, `END TEAM`                                                                |                    |          X          |
 | Team stack abstraction                                                                                                           |                    |          X          |
-| `form-team-stmt`, `change-team-stmt`, `end-team-stmt`                                                                            |                    |          X          |
-| Intrinsic functions related to Coarray Fortran, like `num_images`, etc.                                                          |                    |          X          |
-| Atomic subroutines                                                                                                               |                    |          X          |
-| Collective subroutines                                                                                                           |                    |          X          |
-| Synchronization statements                                                                                                       |                    |          X          |
-| Events                                                                                                                           |                    |          X          |
-| Locks                                                                                                                            |                    |          X          |
-| `critical-construct`                                                                                                             |                    |          X          |
-
-### Caffeine - LBL's Implementation of the Parallel Runtime Interface for Fortran
-
-Implementations of some parts of the Parallel Runtime Interface for Fortran
-exist in [Caffeine], a parallel runtime library targeting coarray Fortran
-compilers. Caffeine will continue to be developed in order to fully implement
-the proposed Parallel Runtime Interface for Fortran. Caffeine uses the
-[GASNet-EX] exascale networking middleware but with the implementation-agnostic
-interface and the ability to vary the communication substrate, it might also be
-possible to develop wrappers that would support the proposed interface with
-[OpenCoarrays], which uses the Message Passing Interface ([MPI]).
-
-## Types Descriptions
-
-### Fortran Intrinsic Derived types
-
-These types will be defined in the PRIF implementation and it is proposed that the
-compiler will use a rename to use the PRIF implementation definitions for these
-types in the compiler's implementation of the `ISO_Fortran_Env` module. This
+| Track coarrays for implicit deallocation at `END TEAM`                                                                           |                    |          X          |
+| Atomic subroutines, e.g. `ATOMIC_FETCH_ADD`                                                                                      |                    |          X          |
+| Collective subroutines, e.g. `CO_BROADCAST`, `CO_SUM`                                                                            |                    |          X          |
+| Synchronization statements, e.g. `SYNC ALL`, `SYNC TEAM`                                                                         |                    |          X          |
+| Events: `EVENT POST`, `EVENT WAIT`                                                                                               |                    |          X          |
+| Locks: `LOCK`, `UNLOCK`                                                                                                          |                    |          X          |
+| `CRITICAL` construct                                                                                                             |                    |          X          |
+| `NOTIFY WAIT` statement                                                                                                          |                    |          X          |
+
+| **NOTE**: Caffeine - LBNL's Implementation of the Parallel Runtime Interface for Fortran |
+| ---------------- |
+| Implementations for much of the Parallel Runtime Interface for Fortran exist in [Caffeine], a parallel runtime library supporting coarray Fortran compilers. Caffeine will continue to be developed in order to fully implement PRIF. Caffeine targets the [GASNet-EX] exascale networking middleware, however PRIF is deliberately agnostic to details of the communication substrate. As such it should be possible to develop PRIF implementations targeting other substrates including the Message Passing Interface ([MPI]). |
+
+## How to read the PRIF specification
+
+The following types and procedures align with corresponding types and procedures
+from the Fortran standard. In many cases, the correspondence is clear from the identifiers.
+For example, the PRIF procedure `prif_num_images` corresponds to the intrinsic function
+`NUM_IMAGES` that is defined in the Fortran standard. In other cases, the correspondence
+may be less clear and is stated explicitly.
+
+In order to avoid redundancy, some details are not included below as the corresponding
+descriptions in the Fortran standard contain the detailed descriptions of what is
+required by the language. For example, this document references the term _coindexed-named-object_
+multiple times, but does not define it since it is part of the language and the Fortran
+standard defines it. As such, in order to fully understand the PRIF specification, it is
+critical to read and reference the Fortran standard alongside it. Additionally, the
+descriptions in the PRIF specification use similar language to the language used in the
+Fortran standard, such as terms like ‘shall’.” Where PRIF uses terms not defined in
+the standard, their definitions may be found in the [`Glossary`](#glossary).
+
+# PRIF Types and Constants
+
+## Fortran Intrinsic Derived Types
+
+These types will be defined by the PRIF implementation. The
+compiler will use these PRIF-provided implementation definitions for the corresponding
+types in the compiler's implementation of the `ISO_FORTRAN_ENV` module. This
 enables the internal structure of each given type to be tailored as needed for
-a given implementation.
+a given PRIF implementation.
 
-#### `prif_team_type`
+### `prif_team_type`
 
-* implementation for `team_type` from `ISO_Fortran_Env`
+* implementation for `TEAM_TYPE` from `ISO_FORTRAN_ENV`
 
-#### `prif_event_type`
+### `prif_event_type`
 
-* implementation for `event_type` from `ISO_Fortran_Env`
+* implementation for `EVENT_TYPE` from `ISO_FORTRAN_ENV`
 
-#### `prif_lock_type`
+### `prif_lock_type`
 
-* implementation for `lock_type` from `ISO_Fortran_Env`
+* implementation for `LOCK_TYPE` from `ISO_FORTRAN_ENV`
 
-#### `prif_notify_type`
+### `prif_notify_type`
 
-* implementation for `notify_type` from `ISO_Fortran_Env`
+* implementation for `NOTIFY_TYPE` from `ISO_FORTRAN_ENV`
 
-### Constants in `ISO_FORTRAN_ENV`
+## Constants in `ISO_FORTRAN_ENV`
 
 These values will be defined in the PRIF implementation and it is proposed that the
 compiler will use a rename to use the PRIF implementation definitions for these
-values in the compiler's implementation of the `ISO_Fortran_Env` module.
+values in the compiler's implementation of the `ISO_FORTRAN_ENV` module.
 
-#### `PRIF_ATOMIC_INT_KIND`
+### `PRIF_ATOMIC_INT_KIND`
 
-This shall be set to an implementation defined value from the `INTEGER_KINDS`
+This shall be set to an implementation-defined value from the compiler-provided `INTEGER_KINDS`
 array.
 
-#### `PRIF_ATOMIC_LOGICAL_KIND`
+### `PRIF_ATOMIC_LOGICAL_KIND`
 
-This shall be set to an implementation defined value from the `LOGICAL_KINDS`
+This shall be set to an implementation-defined value from the compiler-provided `LOGICAL_KINDS`
 array.
 
-#### `PRIF_CURRENT_TEAM`
+### `PRIF_CURRENT_TEAM`
 
 This shall be a value of type `integer(c_int)` that is defined by the
-implementation and shall be distinct from the values `PRIF_INITIAL_TEAM` and
+implementation. It shall be distinct from the values `PRIF_INITIAL_TEAM` and
 `PRIF_PARENT_TEAM`
 
-#### `PRIF_INITIAL_TEAM`
+### `PRIF_INITIAL_TEAM`
 
 This shall be a value of type `integer(c_int)` that is defined by the
-implementation and shall be distinct from the values `PRIF_CURRENT_TEAM` and
+implementation. It shall be distinct from the values `PRIF_CURRENT_TEAM` and
 `PRIF_PARENT_TEAM`
 
-#### `PRIF_PARENT_TEAM`
+### `PRIF_PARENT_TEAM`
 
 This shall be a value of type `integer(c_int)` that is defined by the
-implementation and shall be distinct from the values `PRIF_CURRENT_TEAM` and
+implementation. It shall be distinct from the values `PRIF_CURRENT_TEAM` and
 `PRIF_INITIAL_TEAM`
 
-#### `PRIF_STAT_FAILED_IMAGE`
+### `PRIF_STAT_FAILED_IMAGE`
 
 This shall be a value of type `integer(c_int)` that is defined by the
 implementation to be negative if the implementation cannot detect failed images
-and positive otherwise and shall be distinct from `PRIF_STAT_LOCKED`,
-`PRIF_STAT_LOCKED_OTHER_IMAGE`, `PRIF_STAT_STOPPED_IMAGE`, `PRIF_STAT_UNLOCKED` and
-`PRIF_STAT_UNLOCKED_FAILED_IMAGE`.
+and positive otherwise. It shall be distinct from all other stat constants
+defined by this specification.
 
-#### `PRIF_STAT_LOCKED`
+### `PRIF_STAT_LOCKED`
 
 This shall be a value of type `integer(c_int)` that is defined by the
-implementation and shall be distinct from `PRIF_STAT_FAILED_IMAGE`,
-`PRIF_STAT_LOCKED_OTHER_IMAGE`, `PRIF_STAT_STOPPED_IMAGE`, `PRIF_STAT_UNLOCKED` and
-`PRIF_STAT_UNLOCKED_FAILED_IMAGE`.
+implementation. It shall be distinct from all other stat constants
+defined by this specification.
 
-#### `PRIF_STAT_LOCKED_OTHER_IMAGE`
+### `PRIF_STAT_LOCKED_OTHER_IMAGE`
 
 This shall be a value of type `integer(c_int)` that is defined by the
-implementation and shall be distinct from `PRIF_STAT_FAILED_IMAGE`,
-`PRIF_STAT_LOCKED`, `PRIF_STAT_STOPPED_IMAGE`, `PRIF_STAT_UNLOCKED` and
-`PRIF_STAT_UNLOCKED_FAILED_IMAGE`.
+implementation. It shall be distinct from all other stat constants
+defined by this specification.
 
-#### `PRIF_STAT_STOPPED_IMAGE`
+### `PRIF_STAT_STOPPED_IMAGE`
 
 This shall be a positive value of type `integer(c_int)` that is defined by the
-implementation and shall be distinct from `PRIF_STAT_FAILED_IMAGE`,
-`PRIF_STAT_LOCKED`, `PRIF_STAT_LOCKED_OTHER_IMAGE`, `PRIF_STAT_UNLOCKED` and
-`PRIF_STAT_UNLOCKED_FAILED_IMAGE`.
+implementation. It shall be distinct from all other stat constants
+defined by this specification.
+
+### `PRIF_STAT_UNLOCKED`
+
+This shall be a value of type `integer(c_int)` that is defined by the
+implementation. It shall be distinct from all other stat constants
+defined by this specification.
 
-#### `PRIF_STAT_UNLOCKED`
+### `PRIF_STAT_UNLOCKED_FAILED_IMAGE`
 
 This shall be a value of type `integer(c_int)` that is defined by the
-implementation and shall be distinct from `PRIF_STAT_FAILED_IMAGE`,
-`PRIF_STAT_LOCKED`, `PRIF_STAT_LOCKED_OTHER_IMAGE`, `PRIF_STAT_STOPPED_IMAGE` and
-`PRIF_STAT_UNLOCKED_FAILED_IMAGE`.
+implementation. It shall be distinct from all other stat constants
+defined by this specification.
+
+## PRIF-Specific Constants
 
+This constant is not defined by the Fortran standard.
 
-#### `PRIF_STAT_UNLOCKED_FAILED_IMAGE`
+### `PRIF_STAT_OUT_OF_MEMORY`
 
 This shall be a value of type `integer(c_int)` that is defined by the
-implementation and shall be distinct from `PRIF_STAT_FAILED_IMAGE`,
-`PRIF_STAT_LOCKED`, `PRIF_STAT_LOCKED_OTHER_IMAGE`, `PRIF_STAT_STOPPED_IMAGE` and
-`PRIF_STAT_UNLOCKED`.
+implementation. It shall be distinct from  all other stat constants
+defined by this specification. It shall indicate a low-memory condition
+and may be returned by `prif_allocate_coarray` or `prif_allocate`.
 
-### PRIF specific types
+## PRIF-Specific Types
 
-These types are used to represent opaque "descriptors" that can be passed to and
-from the PRIF implementation between operations.
+These derived types are defined by the PRIF implementation and the contents are
+opaque to the compiler. They don't correspond directly to types mandated
+by the Fortran specification, but rather are helper types used in PRIF to 
+provide the parallel Fortran features.
 
-#### `prif_coarray_handle`
+### `prif_coarray_handle`
 
-* a derived type provided by the PRIF implementation and that will be opaque to the
-  compiler that represents a reference to a coarray variable is used for coarray
-  operations.
-* It maintains some "context data" on a per-image basis, which the compiler may
+* a derived type provided by the PRIF implementation whose contents are opaque to the
+  compiler. It represents a reference to a coarray descriptor and is passed 
+  back and forth across PRIF for coarray operations. 
+* Each coarray descriptor maintains some "context data" on a per-image basis, which the compiler may
   use to support proper implementation of coarray arguments, especially with
-  respect to automatic deallocation of coarrays at an `end team` statement. This
-  is accessed/set with the provided procedures `prif_get_context_handle` and
+  respect to `MOVE_ALLOC` operations on allocatable coarrays.
+  This is accessed/set with the procedures `prif_get_context_handle` and
   `prif_set_context_handle`. PRIF does not interpret the contents of this context data in
   any way, and it is only accessible on the current image. The context data is
   a property of the allocated coarray object, and is thus shared between all
   handles and aliases that refer to the same coarray allocation (i.e. those
   created from a call to `prif_alias_create`).
 
-#### `prif_critical_type`
+### `prif_critical_type`
 
-* a derived type provided by the PRIF implementation that will be opaque to the
-  compiler that will be used for implementing `critical` blocks
+* a derived type provided by the PRIF implementation that is opaque to the
+  compiler and is used for implementing `critical` blocks
 
-## Procedure descriptions
+# PRIF Procedures
 
-The PRIF API provides implementations of parallel Fortran features, as specified
+**The PRIF API provides implementations of parallel Fortran features, as specified
 in Fortran 2023. For any given `prif_*` procedure that corresponds to a Fortran
 procedure or statement of similar name, the constraints and semantics associated
-with each argument to the `prif_` procedure match those of the analogous
+with each argument to the `prif_*` procedure match those of the analogous
 argument to the parallel Fortran feature, except where this document explicitly
 specifies otherwise. For any given `prif_*` procedure that corresponds to a Fortran
 procedure or statement of similar name, the constraints and semantics match those
-of the analogous parallel Fortran feature. Specifically, any required synchronization
-is performed by the PRIF implementation unless otherwise specified.
+of the analogous parallel Fortran feature. In particular, any required synchronization
+is performed by the PRIF implementation unless otherwise specified.**
+
+| **IMPLEMENTATION NOTE**: |
+| ---------------- |
+| The PRIF API is defined as a set of Fortran language procedures and supporting types, and as such an implementation of PRIF cannot be expressed solely in C/C++. However C/C++ can be used to implement portions of the PRIF procedures via calls to BIND(C) procedures. |
 
 Where possible, optional arguments are used for optional parts or different
 forms of statements or procedures. In some cases the different forms or presence
 of certain options change the return type or rank, and in those cases a generic
 interface with different specific procedures is used.
 
-### Common arguments
+## Common Arguments
 
-* **`team`**
-  * a value of type `prif_team_type` that identifies a team that the
-    current image is a member of
-  * shall not be present with `team_number` except in a call to `prif_form_team`
-* **`team_number`**
-  * a value of type `integer(c_intmax_t)` that identifies a sibling team or
-    in a call to `prif_form_team`, which team to become a member of
-  * shall not be present with `team` except in a call to `prif_form_team`
-* **`image_num`, any argument identifying an image**
-  * May identify the current image
+There are multiple Common Arguments sections throughout the specification that
+outline details of the arguments that are common for the following sections
+of procedure interfaces.
 
 ### Integer and Pointer Arguments
 
@@ -349,11 +408,11 @@ pointers and/or integers. These fall broadly into the following categories.
 4. `integer(c_ptrdiff_t)`: strides between elements for non-contiguous coarray
    accesses
 5. `integer(c_int)`: Integer arguments corresponding to image index and
-  stat arguments. It is expected that the most common arguments
-  appearing in Fortran code will be of default integer, it is expected that
+  stat arguments. It is expected that the most common integer arguments
+  appearing in Fortran code will be of default integer kind, it is expected that
   this will correspond with that kind, and there is no reason to expect these
   arguments to have values that would not be representable in this kind.
-6. `integer(c_intmax_t)`: Bounds, cobounds, indices, coindices, and any other
+6. `integer(c_intmax_t)`: Bounds, cobounds, indices, cosubscripts, and any other
   argument to an intrinsic procedure that accepts or returns an arbitrary
   integer.
 
@@ -361,46 +420,67 @@ The compiler is responsible for generating values and temporary variables as
 necessary to pass arguments of the correct type/size, and perform conversions
 when needed.
 
-#### sync-stat-list
+### Common Arguments
+
+* **`team`**
+  * a value of type `prif_team_type` that identifies a team that the
+    current image is a member of
+  * shall not be present with `team_number` except in a call to `prif_form_team`
+* **`team_number`**
+  * a value of type `integer(c_intmax_t)` that identifies a sibling team or,
+    in a call to `prif_form_team`, which team to join
+  * shall not be present with `team` except in a call to `prif_form_team`
+* **`image_num`**
+  * an argument identifying the image to be communicated with
+  * is permitted to identify the current image
+  * the image index is always relative to the initial team, unless otherwise specified
+
+### `stat` and `errmsg` Arguments
 
-* **`stat`** : This argument is `intent(out)` representing the presence and
-  type of any error that occurs. A value of zero, indicates no error occurred.
+* **`stat`** : This argument is `intent(out)` and represents the presence and
+  type of any error that occurs. A value of zero indicates no error occurred.
   It is of type `integer(c_int)`, to minimize the frequency that integer
   conversions will be needed. If a different kind of integer is used as the
   argument, it is the compiler's responsibility to use an intermediate variable
   as the argument to the PRIF implementation procedure and provide conversion to the
   actual argument.
-* **`errmsg` or `errmsg_alloc`** : There are two optional arguments for this,
+* **`errmsg` or `errmsg_alloc`** : There are two optional `intent(out)` arguments for this,
   one which is allocatable and one which is not. It is the compiler's
-  responsibility to ensure the appropriate optional argument is passed.
+  responsibility to ensure the appropriate optional argument is passed,
+  and at most one shall be provided in any given call.
   If no error occurs, the definition status of the actual argument is unchanged.
 
-### Program startup and shutdown
+## Program Startup and Shutdown
 
 For a program that uses parallel Fortran features, the compiler shall insert
 calls to `prif_init` and `prif_stop`. These procedures will initialize and
 terminate the parallel runtime. `prif_init` shall be called prior
-to any other calls to the PRIF implementation.
+to any other calls to the PRIF implementation. `prif_stop` shall be called
+to initiate normal termination if the program reaches normal termination
+at the end of the main program.
 
-#### `prif_init`
+### `prif_init`
 
-* **Description**: This procedure will initialize the parallel environment.
-* **Procedure Interface**:
+**Description**: This procedure will initialize the parallel environment.
+    
 ```
-subroutine prif_init(exit_code)
-  integer(c_int), intent(out) :: exit_code
+subroutine prif_init(stat)
+  integer(c_int), intent(out) :: stat
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`exit_code`**: a non-zero value indicates an error occurred during
-    initialization.
+**Further argument descriptions**:
 
-#### `prif_stop`
+* **`stat`**: a non-zero value indicates an error occurred during
+  initialization.
 
-* **Description**: This procedure synchronizes all executing images, cleans up
+### `prif_stop`
+
+**Description**: This procedure synchronizes all executing images, cleans up
   the parallel runtime environment, and terminates the program.
-  Calls to this procedure do not return.
-* **Procedure Interface**:
+  Calls to this procedure do not return. This procedure supports both normal
+  termination at the end of a program, as well as any `STOP` statements from
+  the user source code.
+    
 ```
 subroutine prif_stop(quiet, stop_code_int, stop_code_char)
   logical(c_bool), intent(in) :: quiet
@@ -408,23 +488,24 @@ subroutine prif_stop(quiet, stop_code_int, stop_code_char)
   character(len=*), intent(in), optional :: stop_code_char
 end subroutine
 ```
-* **Further argument descriptions**: At most one of the arguments
+**Further argument descriptions**: At most one of the arguments
   `stop_code_int` or `stop_code_char` shall be supplied.
-  * **`quiet`**: if this argument has the value `.true.`, no output of
-    signaling exceptions or stop code will be produced. Note that in the case
-    the statement does not contain this optional part, the compiler should
-    provide the value `.false.`.
-  * **`stop_code_int`**: is used as the process exit code if it is provided.
-    Otherwise, the process exit code is `0`.
-  * **`stop_code_char`**: is written to the unit identified by the named
-    constant `OUTPUT_UNIT` from the intrinsic module `ISO_FORTRAN_ENV` if
-    provided.
-
-#### `prif_error_stop`
-
-* **Description**: This procedure terminates all executing images
+
+* **`quiet`**: if this argument has the value `.true.`, no output of
+  signaling exceptions or stop code will be produced. If a `STOP` statement
+  does not contain this optional part, the compiler should
+  provide the value `.false.`.
+* **`stop_code_int`**: is used as the process exit code if it is provided.
+  Otherwise, the process exit code is `0`.
+* **`stop_code_char`**: is written to the unit identified by the named
+  constant `OUTPUT_UNIT` from the intrinsic module `ISO_FORTRAN_ENV` if
+  provided.
+
+### `prif_error_stop`
+
+**Description**: This procedure terminates all executing images.
   Calls to this procedure do not return.
-* **Procedure Interface**:
+    
 ```
 subroutine prif_error_stop(quiet, stop_code_int, stop_code_char)
   logical(c_bool), intent(in) :: quiet
@@ -432,35 +513,36 @@ subroutine prif_error_stop(quiet, stop_code_int, stop_code_char)
   character(len=*), intent(in), optional :: stop_code_char
 end subroutine
 ```
-* **Further argument descriptions**: At most one of the arguments
+**Further argument descriptions**: At most one of the arguments
   `stop_code_int` or `stop_code_char` shall be supplied.
-  * **`quiet`**: if this argument has the value `.true.`, no output of
-    signaling exceptions or stop code will be produced. Note that in the case
-    the statement does not contain this optional part, the compiler should
-    provide the value `.false.`.
-  * **`stop_code_int`**: is used as the process exit code if it is provided.
-    Otherwise, the process exit code is a non-zero value.
-  * **`stop_code_char`**: is written to the unit identified by the named
-    constant `ERROR_UNIT` from the intrinsic module `ISO_FORTRAN_ENV` if
-    provided.
-
-#### `prif_fail_image`
-
-* **Description**: causes the executing image to cease participating in
+
+* **`quiet`**: if this argument has the value `.true.`, no output of
+  signaling exceptions or stop code will be produced. If an `ERROR STOP`
+  statement does not contain this optional part, the compiler should
+  provide the value `.false.`.
+* **`stop_code_int`**: is used as the process exit code if it is provided.
+  Otherwise, the process exit code is a non-zero value.
+* **`stop_code_char`**: is written to the unit identified by the named
+  constant `ERROR_UNIT` from the intrinsic module `ISO_FORTRAN_ENV` if
+  provided.
+
+### `prif_fail_image`
+
+**Description**: causes the executing image to cease participating in
   program execution without initiating termination.
   Calls to this procedure do not return.
-* **Procedure Interface**:
+    
 ```
 subroutine prif_fail_image()
 end subroutine
 ```
 
-### Image Queries
+## Image Queries
 
-#### `prif_num_images`
+### `prif_num_images`
 
-* **Description**: Query the number of images in the specified or current team.
-* **Procedure Interface**:
+**Description**: Query the number of images in the specified or current team.
+    
 ```
 subroutine prif_num_images(team, team_number, image_count)
   type(prif_team_type), intent(in), optional :: team
@@ -468,16 +550,16 @@ subroutine prif_num_images(team, team_number, image_count)
   integer(c_int), intent(out) :: image_count
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`team` and `team_number`**: optional arguments that specify a team. They
-    shall not both be present in the same call.
+**Further argument descriptions**:
+
+* **`team` and `team_number`**: optional arguments that specify a team. They
+  shall not both be present in the same call.
 
-#### `prif_this_image`
+### `prif_this_image`
 
-* **Description**: Determine the image index or cosubscripts with respect to a
+**Description**: Determine the image index or cosubscripts with respect to a
   given coarray of the current image in a given team or the current team.
-  team, or the cosubscripts
-* **Procedure Interface**:
+    
 ```
 interface prif_this_image
   subroutine prif_this_image_no_coarray(team, image_index)
@@ -501,19 +583,21 @@ interface prif_this_image
   end subroutine
 end interface
 ```
-* **Further argument descriptions**:
-  * **`cosubscripts`**: the cosubcripts that would identify the current image
-    in the specified team when used as coindices for the specified coarray
-  * **`dim`**: identify which of the elements from `cosubscripts` should be
-    returned as the `cosubscript` value
-  * **`cosubscript`**: the element identified by `dim` or the array
-    `cosubscripts` that would have been returned without the `dim` argument
-    present
+**Further argument descriptions**:
 
-#### `prif_failed_images`
+* **`coarray_handle`**: is described in the Common Arguments section under [`Storage Management`](#storage-management)
+* **`cosubscripts`**: the cosubscripts that would identify the current image
+  in the specified team when used as cosubscripts for the specified coarray
+* **`dim`**: identify which of the elements from `cosubscripts` should be
+  returned as the `cosubscript` value
+* **`cosubscript`**: the element identified by `dim` of the array
+  `cosubscripts` that would have been returned without the `dim` argument
+  present
 
-* **Description**: Determine the image indices of known failed images, if any.
-* **Procedure Interface**:
+### `prif_failed_images`
+
+**Description**: Determine the image indices of any images known to have failed.
+    
 ```
 subroutine prif_failed_images(team, failed_images)
   type(prif_team_type), intent(in), optional :: team
@@ -521,11 +605,11 @@ subroutine prif_failed_images(team, failed_images)
 end subroutine
 ```
 
-#### `prif_stopped_images`
+### `prif_stopped_images`
 
-* **Description**: Determine the image indices of images known to have initiated
-  normal termination, if any.
-* **Procedure Interface**:
+**Description**: Determine the image indices of any images known to have initiated
+  normal termination.
+    
 ```
 subroutine prif_stopped_images(team, stopped_images)
   type(prif_team_type), intent(in), optional :: team
@@ -533,10 +617,10 @@ subroutine prif_stopped_images(team, stopped_images)
 end subroutine
 ```
 
-#### `prif_image_status`
+### `prif_image_status`
 
-* **Description**: Determine the image execution state of an image
-* **Procedure Interface**:
+**Description**: Determine the image execution state of an image
+    
 ```
 impure elemental subroutine prif_image_status(image, team, image_status)
   integer(c_int), intent(in) :: image
@@ -544,62 +628,49 @@ impure elemental subroutine prif_image_status(image, team, image_status)
   integer(c_int), intent(out) :: image_status
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`image`**: the image index of the image in the given or current team for
-    which to return the execution status
-  * **`team`**: if provided, the team from which to identify the image
-  * **`image_status`**: has the value `PRIF_STAT_FAILED_IMAGE` if the identified
+**Further argument descriptions**:
+
+* **`image`**: the image index of the image in the given or current team for
+  which to return the execution status
+* **`team`**: if provided, the team from which to identify the image
+* **`image_status`**: defined to the value `PRIF_STAT_FAILED_IMAGE` if the identified
     image has failed, `PRIF_STAT_STOPPED_IMAGE` if the identified image has initiated
-    normal termination, or zero.
+    normal termination, otherwise zero.
 
-### Coarrays
+## Storage Management
 
-#### Common arguments
+### Common Arguments
 
 * **`coarray_handle`**
   * Argument for many of the coarray access procedures
   * scalar of type [`prif_coarray_handle`](#prif_coarray_handle)
-  * is a handle for the established coarray
-  * represents the distributed object of the coarray in the team in which it
-    was established
-* **`coindices`**
+  * is a handle for the descriptor of an established coarray
+* **`cosubscripts`**
   * Argument for many of the coarray access procedures
-  * 1d assumed-shape array of type `integer`
-  * correspond to the coindices appearing in a coindexed object
-* **`value`** or `local_buffer`
+  * 1d assumed-shape array of type `integer(c_intmax_t)`
+  * correspond to the cosubscripts appearing in a _coindexed-named-object_ reference
+* **`value`** or `current_image_buffer`
   * Argument for `put` and `get` operations
   * assumed-rank array of `type(*)` or `type(c_ptr)`
   * It is the value to be sent in a `put` operation, and is assigned the value
     retrieved in the case of a `get` operation
 * **`image_num`**
-  * identifies the image to be communicated with
-  * is the image index in the initial team
-  * may be the current image
-
-#### Allocation and deallocation
-
-Calls to `prif_allocate` and `prif_deallocate` are collective operations, while
-other allocation/deallocation operations are not. Note that a call to
-`move_alloc` with coarray arguments is also a collective operation, as described
-in the section below.
-
-##### Static coarray allocation
-
-The compiler is responsible to generate code that collectively runs
-`prif_allocate` once for each static coarray and initializes them where applicable.
+  * an argument identifying the image to be communicated with
+  * is permitted to identify the current image
+  * the image index is always relative to the initial team, unless otherwise specified
 
-##### `prif_allocate`
+### `prif_allocate_coarray`
 
-* **Description**: This procedure allocates memory for a coarray. 
+**Description**: This procedure allocates memory for a coarray. 
   This call is collective over the current team.  Calls to
-  `prif_allocate` will be inserted by the compiler when there is an explicit
+  `prif_allocate_coarray` will be inserted by the compiler when there is an explicit
   coarray allocation or at the beginning of a program to allocate space for
   statically declared coarrays in the source code. The PRIF implementation will
   store the coshape information in order to internally track it during the
   lifetime of the coarray.
-* **Procedure Interface**:
+    
 ```
-subroutine prif_allocate( &
+subroutine prif_allocate_coarray( &
     lcobounds, ucobounds, lbounds, ubounds, element_length, &
     final_func, coarray_handle, allocated_memory, &
     stat, errmsg, errmsg_alloc)
@@ -614,56 +685,56 @@ subroutine prif_allocate( &
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`lcobounds` and `ucobounds`**: Shall be the lower and upper bounds of the
-    codimensions of the coarray being allocated. Shall be 1d arrays with the
-    same dimensions as each other. The cobounds shall be sufficient to have a
-    unique index for every image in the current team.
-    I.e. `product(coshape(coarray)) >= num_images`.
-  * **`lbounds` and `ubounds`**: Shall be the the lower and upper bounds of the
-    local portion of the array. Shall be 1d arrays with the same dimensions as
-    each other.
-  * **`element_length`**: size of a single element of the array in bytes
-  * **`final_func`**: Shall be a function pointer to the final subroutine, if any,
-    for derived types. It is the responsibility of the compiler to generate
-    such a subroutine if necessary to clean up allocatable components, typically
-    with calls to `prif_deallocate_non_symmetric`. It may also be necessary to
-    modify the allocation status of the coarray variable, especially in the case
-    that it was allocated through a dummy argument. Its interface should be
-    equivalent to the following Fortran interface
-    ```
-    subroutine coarray_cleanup(handle, stat, errmsg) bind(C)
-      type(prif_coarray_handle), intent(in) :: handle
-      integer(c_int), intent(out) :: stat
-      character(len=:), intent(out), allocatable :: errmsg
-    end subroutine
-    ```
-    or to the following equivalent C prototype
-    ```
-    void coarray_cleanup( 
-        prif_handle_t* handle, int* stat, CFI_cdesc_t* errmsg)
-    ```
-    The coarray handle can then be interrogated to determine the memory address
-    and size of the data in order to orchestrate calling any necessary final
-    subroutines or deallocation of any allocatable components, or the context
-    data to orchestrate modifying the allocation status of a local variable
-    portion of the coarray. It will be invoked once on each image, upon
-    deallocation of the coarray.
-  * **`coarray_handle`**: Represents the distributed object of the coarray on
-    the corresponding team. The handle is created by the PRIF implementation and the
-    compiler uses it for subsequent coindexed-object references of the
-    associated coarray and for deallocation of the associated coarray.
-  * **`allocated_memory`**: A pointer to the local block of allocated memory for
-    the Fortran object. The compiler is responsible for associating the local
-    Fortran object with this memory, and initializing it if necessary.
-
-##### `prif_allocate_non_symmetric`
-
-* **Description**: This procedure is used to allocate components of coarray
-  objects.
-* **Procedure Interface**:
-```
-subroutine prif_allocate_non_symmetric( &
+**Further argument descriptions**:
+
+* **`lcobounds` and `ucobounds`**: Shall be the lower and upper bounds of the
+  codimensions of the coarray being allocated. Shall be 1d arrays with the
+  same dimensions as each other. The cobounds shall be sufficient to have a
+  unique index for every image in the current team.
+  I.e. `product(ucobounds - lcobounds + 1) >= num_images()`.
+* **`lbounds` and `ubounds`**: Shall be the the lower and upper bounds of the
+  current image's portion of the array. Shall be 1d arrays with the same dimensions as
+  each other.
+* **`element_length`**: size of a single element of the array in bytes
+* **`final_func`**: Shall be the C address of a procedure that is interoperable, or
+  `C_NULL_FUNPTR`. If not null, this procedure will be invoked by the PRIF implementation
+  once by each image at deallocation of this coarray, before the storage is released.
+  The procedure's interface shall be equivalent to the following Fortran interface
+  ```
+  subroutine coarray_cleanup(handle, stat, errmsg) bind(C)
+    type(prif_coarray_handle), pointer, intent(in) :: handle
+    integer(c_int), intent(out) :: stat
+    character(len=:), intent(out), allocatable :: errmsg
+  end subroutine
+  ```
+  or to the following equivalent C prototype
+  ```
+  void coarray_cleanup( 
+      CFI_cdesc_t* handle, int* stat, CFI_cdesc_t* errmsg)
+  ```
+* **`coarray_handle`**: Represents the distributed object of the coarray on
+  the corresponding team. The handle is created by the PRIF implementation and the
+  compiler uses it for subsequent _coindexed-named-object_ references of the
+  associated coarray and for deallocation of the associated coarray.
+* **`allocated_memory`**: A pointer to the block of allocated but uninitialized memory
+  that provides the storage for the current image's coarray. The compiler is responsible
+  for associating the Fortran-level coarray object with this storage, and initializing
+  the storage if necessary. The returned pointer value may differ across images in the team.
+  `prif_base_pointer` should be used to locate corresponding coarrays on
+  other images.
+
+| **CLIENT NOTE**: |
+| ---------------- |
+| `final_func` is used by the compiler to support various clean-up operations at coarray deallocation, whether it happens explicitly (i.e. via `prif_deallocate_coarray`) or implicitly (e.g. via `prif_end_team`). First, `final_func` may be used to support the user-defined final subroutine for derived types. Second, it may be necessary for the compiler to generate such a subroutine to clean up allocatable components, typically with calls to `prif_deallocate`. Third, it may also be necessary to modify the allocation status of an allocatable coarray variable, especially in the case that it was allocated through a dummy argument.
+The coarray handle can be interrogated by the procedure callback using PRIF queries to determine the memory address and size of the data in order to orchestrate calling any necessary final subroutines or deallocation of any allocatable components, or the context data to orchestrate modifying the allocation status of a local variable portion of the coarray. The `pointer` attribute for the `handle` argument is to permit `prif_coarray_handle` definitions which are not C interoperable. |
+
+### `prif_allocate`
+
+**Description**: This procedure is used to non-collectively allocate remotely accessible storage, 
+  such as needed for an allocatable component of a coarray.
+    
+```
+subroutine prif_allocate( &
     size_in_bytes, allocated_memory, stat, errmsg, errmsg_alloc)
   integer(kind=c_size_t) :: size_in_bytes
   type(c_ptr), intent(out) :: allocated_memory
@@ -672,49 +743,52 @@ subroutine prif_allocate_non_symmetric( &
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`size_in_bytes`**: The size, in bytes, of the object to be allocated.
-  * **`allocated_memory`**: A pointer to the block of allocated memory for the
-    Fortran object. The compiler is responsible for associating the Fortran
-    object with this memory, and initializing it if necessary.
+**Further argument descriptions**:
 
-##### `prif_deallocate`
+* **`size_in_bytes`**: The size, in bytes, of the object to be allocated.
+* **`allocated_memory`**: A pointer to the block of allocated but uninitialized memory 
+  that provides the requested storage. The compiler is responsible for associating the Fortran
+  object with this storage, and initializing the storage if necessary.
 
-* **Description**: This procedure releases memory previously allocated for all
+### `prif_deallocate_coarray`
+
+**Description**: This procedure releases memory previously allocated for all
   of the coarrays associated with the handles in `coarray_handles`. This means
   that any local objects associated with this memory become invalid. The
   compiler will insert calls to this procedure when exiting a local scope where
   implicit deallocation of a coarray is mandated by the standard and when a
-  coarray is explicitly deallocated through a `deallocate-stmt` in the source
-  code.
+  coarray is explicitly deallocated through a `DEALLOCATE` statement.
   This call is collective over the current team, and the provided list of handles
   must denote corresponding coarrays (in the same order on every image) that
-  were allocated by the current team using `prif_allocate` and not yet deallocated.
-  It will start with a synchronization over the current team, and then the final subroutine
+  were allocated by the current team using `prif_allocate_coarray` and not yet deallocated.
+  The implementation starts with a synchronization over the current team, and then the final subroutine
   for each coarray (if any) will be called. A synchronization will also occur
   before control is returned from this procedure, after all deallocation has been
   completed.
-* **Procedure Interface**:
+    
 ```
-subroutine prif_deallocate( &
+subroutine prif_deallocate_coarray( &
     coarray_handles, stat, errmsg, errmsg_alloc)
-  type(prif_coarray_handle), intent(in) :: coarray_handles(:)
+  type(prif_coarray_handle), target, intent(in) :: coarray_handles(:)
   integer(c_int), intent(out), optional :: stat
   character(len=*), intent(inout), optional :: errmsg
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-* **Argument descriptions**:
-  * **`coarray_handles`**: Is an array of all of the handles for the coarrays
-    that shall be deallocated.
+**Further argument descriptions**:
+
+* **`coarray_handles`**: Is an array of all of the handles for the coarrays
+  that shall be deallocated. Note that the target attribute is not required
+  for the actual argument to this procedure. It is only to allow the
+  implementation to call the `final_func` procedures with each handle.
 
-##### `prif_deallocate_non_symmetric`
+### `prif_deallocate`
 
-* **Description**: This procedure releases memory previously allocated by a call
-  to `prif_allocate_non_symmetric`.
-* **Procedure Interface**:
+**Description**: This non-collective procedure releases memory previously allocated by a call
+  to `prif_allocate`.
+    
 ```
-subroutine prif_deallocate_non_symmetric( &
+subroutine prif_deallocate( &
     mem, stat, errmsg, errmsg_alloc)
   type(c_ptr), intent(in) :: mem
   integer(c_int), intent(out), optional :: stat
@@ -722,61 +796,77 @@ subroutine prif_deallocate_non_symmetric( &
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`mem`**: Pointer to the block of memory to be released.
+**Further argument descriptions**:
+
+* **`mem`**: Pointer to the block of memory to be released.
+
+| **CLIENT NOTE**: |
+| ---------------- |
+| Calls to `prif_allocate_coarray` and `prif_deallocate_coarray` are collective operations, while calls to `prif_allocate` and `prif_deallocate` are not. Note that a call to `MOVE_ALLOC` with coarray arguments is also a collective operation, as described in the section below. |
 
-##### `prif_alias_create`
+| **CLIENT NOTE**: |
+| ---------------- |
+| The compiler is responsible to generate code that collectively runs `prif_allocate_coarray` once for each static coarray and initializes them where applicable.|
 
-* **Description**: Create a new coarray handle for an existing coarray, such as
-  in a [`prif_change_team`](#prif_change_team) or to pass to a coarray dummy
+### `prif_alias_create`
+
+**Description**: Create a new coarray handle for an existing coarray, such as part of `CHANGE TEAM`
+  after [`prif_change_team`](#prif_change_team), or to pass to a coarray dummy
   argument (especially in the case that the cobounds are different)
-* **Procedure Interface**:
+    
 ```
 subroutine prif_alias_create( &
-    source_handle, alias_co_lbounds, alias_co_ubounds, alias_handle)
+    source_handle, alias_lcobounds, alias_ucobounds, alias_handle)
   type(prif_coarray_handle), intent(in) :: source_handle
-  integer(c_intmax_t), intent(in) :: alias_co_lbounds(:)
-  integer(c_intmax_t), intent(in) :: alias_co_ubounds(:)
+  integer(c_intmax_t), intent(in) :: alias_lcobounds(:)
+  integer(c_intmax_t), intent(in) :: alias_ucobounds(:)
   type(prif_coarray_handle), intent(out) :: alias_handle
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`source_handle`**: a handle (which may itself be an alias) to the existing
-    coarray for which an alias is to be created
-  * **`alias_co_lbounds` and `alias_co_ubounds`**: the cobounds to be used for
-    the new alias
-  * **`alias_handle`**: a new alias to the existing coarray
+**Further argument descriptions**:
+
+* **`source_handle`**: a handle (which may itself be an alias) to the existing
+  coarray for which an alias is to be created
+* **`alias_lcobounds` and `alias_ucobounds`**: the cobounds to be used for
+  the new alias. Both arguments must have the same size, but it need not
+  match the corank associated with `source_handle`
+* **`alias_handle`**: a new alias to the existing coarray
 
-##### `prif_alias_destroy`
+### `prif_alias_destroy`
 
-* **Description**: Delete an alias to a coarray
-* **Procedure Interface**:
+**Description**: Delete an alias to a coarray. Does not deallocate the original coarray.
+    
 ```
 subroutine prif_alias_destroy(alias_handle)
   type(prif_coarray_handle), intent(in) :: alias_handle
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`alias_handle`**: the alias to be destroyed
+**Further argument descriptions**:
+
+* **`alias_handle`**: the alias to be destroyed
 
-##### `move_alloc`
+### `MOVE_ALLOC`
 
-This is not provided by PRIF, but should be easily implemented through
-manipulation of `prif_coarray_handle`s. Note that calls to
-`prif_set_context_data` will likely be required as part of the operation. Note
-that `move_alloc` with coarray arguments is an image control statement that
+This is not provided by PRIF because it depends on unspecified details
+of the compiler's `allocatable` attribute. It is the compiler's responsibility
+to implement `MOVE_ALLOC` using PRIF-provided operations. For example, according
+to the Fortran standard, `MOVE_ALLOC` with coarray arguments is an image control statement that
 requires synchronization, so the compiler should likely insert call(s) to
 `prif_sync_all` as part of the implementation.
 
-#### Queries
+| **CLIENT NOTE**: |
+| ---------------- |
+| It is envisioned that the use of `prif_set_context_data` and `prif_get_context_data` will allow for an efficient implementation of `MOVE_ALLOC` that maintains tracking of allocation status |
 
-##### `prif_set_context_data`
+## Coarray Queries
 
-* **Description**: This procedure stores a `c_ptr` associated with a coarray
-  handle for future retrieval. A typical usage would be to store a reference
+### `prif_set_context_data`
+
+**Description**: This procedure stores a `c_ptr` associated with a coarray
+  for future retrieval. A typical usage would be to store a reference
   to the actual variable whose allocation status must be changed in the case
   that the coarray is deallocated.
-* **Procedure Interface**:
+    
 ```
 subroutine prif_set_context_data(coarray_handle, context_data)
   type(prif_coarray_handle), intent(in) :: coarray_handle
@@ -784,12 +874,12 @@ subroutine prif_set_context_data(coarray_handle, context_data)
 end subroutine
 ```
 
-##### `prif_get_context_data`
+### `prif_get_context_data`
 
-* **Description**: This procedure returns the `c_ptr` provided in the most
+**Description**: This procedure returns the `c_ptr` provided in the most
   recent call to [`prif_set_context_data`](#prif_set_context_data) with the
-  same coarray handle
-* **Procedure Interface**:
+  same coarray (possibly via an alias coarray handle).
+    
 ```
 subroutine prif_get_context_data(coarray_handle, context_data)
   type(prif_coarray_handle), intent(in) :: coarray_handle
@@ -797,49 +887,59 @@ subroutine prif_get_context_data(coarray_handle, context_data)
 end subroutine
 ```
 
-##### `prif_base_pointer`
+### `prif_base_pointer`
 
-* **Description**: This procedure returns a C pointer value referencing the base of the
-  coarray elements on a given image and may be used in conjunction with
+**Description**: This procedure returns a C pointer value referencing the base of the
+  corresponding coarray elements on a given image and may be used in conjunction with
   various communication operations. Pointer arithmetic operations may be
   performed with the value and the results provided as input to the
   `get/put_*raw` or atomic procedures (none of which are guaranteed to perform
   validity checks, e.g., to detect out-of-bounds access violations).
   It is not valid to dereference the produced pointer value
   or the result of any operations performed with it on any image except for
-  the identified image.
-* **Procedure Interface**:
+  the identified image. If the `image_num` argument is zero, then `coarray_handle` is ignored
+  and `ptr` becomes defined with the value zero. It is an error to pass
+  a number less than `0` or greater than the number of images to the `image_num` argument,
+  in which case `ptr` becomes undefined.
+    
 ```
-subroutine prif_base_pointer( &
-    coarray_handle, coindices, team, team_number, ptr)
+subroutine prif_base_pointer(coarray_handle, image_num, ptr)
   type(prif_coarray_handle), intent(in) :: coarray_handle
-  integer(c_intmax_t), intent(in) :: coindices(:)
-  type(prif_team_type), optional, intent(in) :: team
-  integer(c_intmax_t), optional, intent(in) :: team_number
+  integer(c_int), intent(in) :: image_num
   integer(c_intptr_t), intent(out) :: ptr
 end subroutine
 ```
+**Further argument descriptions**:
+
+* **`image_num`**: identifies the image number in the initial team on which
+  the address is being requested
+* **`ptr`**: returns a pointer to the beginning of the data elements
+  for the corresponding coarray on the identified image 
 
-##### `prif_local_data_size`
+### `prif_size_bytes`
 
-* **Description**: This procedure returns the size of the coarray data associated
+**Description**: This procedure returns the size of the coarray element data associated
   with the current image. This will be equal to the following expression of the
-  arguments provided to [`prif_allocate`](#prif_allocate) at the time that the
+  arguments provided to [`prif_allocate_coarray`](#prif_allocate_coarray) at the time that the
   coarray was allocated; `element_length * product(ubounds-lbounds+1)`
-* **Procedure Interface**:
+    
 ```
-subroutine prif_local_data_size(coarray_handle, data_size)
+subroutine prif_size_bytes(coarray_handle, data_size)
   type(prif_coarray_handle), intent(in) :: coarray_handle
   integer(c_size_t), intent(out) :: data_size
 end subroutine
 ```
 
-##### `prif_lcobound`
+| **CLIENT NOTE**: |
+| ---------------- |
+| `prif_size_bytes` can be used to calculate the number of elements in an array coarray given only the handle and element size |
+
+### `prif_lcobound`
 
-* **Description**: returns the lower cobound(s) of the coarray referred to by
-  the coarray_handle. It is the compiler's responsibility to convert to a
-  different kind if the `kind` argument appears.
-* **Procedure Interface**:
+**Description**: returns the lower cobound(s) associated with a coarray handle.
+  It is the compiler's responsibility to convert to a
+  different kind if the `kind` argument to `LCOBOUND` appears.
+    
 ```
 interface prif_lcobound
   subroutine prif_lcobound_with_dim(coarray_handle, dim, lcobound)
@@ -853,18 +953,19 @@ interface prif_lcobound
   end subroutine
 end interface
 ```
-* **Further argument descriptions**:
-  * **`dim`**: which codimension of the coarray to report the lower cobound of
-  * **`lcobound`**: the lower cobound of the given dimension
-  * **`lcobounds`**: an array of the size of the corank of the coarray, returns
-    the lower cobounds of the given coarray
+**Further argument descriptions**:
 
-##### `prif_ucobound`
+* **`dim`**: which codimension of the coarray to report the lower cobound of
+* **`lcobound`**: the lower cobound of the given dimension
+* **`lcobounds`**: an array of the size of the corank of the coarray handle, returns
+  the lower cobounds of the given coarray handle
 
-* **Description**: returns the upper cobound(s) of the coarray referred to by
-  the coarray_handle. It is the compiler's responsibility to convert to a
-  different kind if the `kind` argument appears.
-* **Procedure Interface**:
+### `prif_ucobound`
+
+**Description**: returns the upper cobound(s) associated with a coarray handle.
+  It is the compiler's responsibility to convert to a
+  different kind if the `kind` argument to `UCOBOUND` appears.
+    
 ```
 interface prif_ucobound
   subroutine prif_ucobound_with_dim(coarray_handle, dim, ucobound)
@@ -878,32 +979,34 @@ interface prif_ucobound
   end subroutine
 end interface
 ```
-* **Further argument descriptions**:
-  * **`dim`**: which codimension of the coarray to report the upper cobound of
-  * **`ucobound`**: the upper cobound of the given dimension
-  * **`ucobounds`**: an array of the size of the corank of the coarray, returns
-    the upper cobounds of the given coarray
+**Further argument descriptions**:
+
+* **`dim`**: which codimension of the coarray to report the upper cobound of
+* **`ucobound`**: the upper cobound of the given dimension
+* **`ucobounds`**: an array of the size of the corank of the coarray handle, returns
+    the upper cobounds of the given coarray handle
 
-##### `prif_coshape`
+### `prif_coshape`
 
-* **Description**:
-* **Procedure Interface**:
+**Description**: returns the sizes of codimensions of a coarray
+    
 ```
 subroutine prif_coshape(coarray_handle, sizes)
   type(prif_coarray_handle), intent(in) :: coarray_handle
   integer(c_size_t), intent(out) :: sizes(:)
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`sizes`**: an array of the size of the corank of the coarray, returns the
+**Further argument descriptions**:
+
+* **`sizes`**: an array of the size of the corank of the coarray handle, returns the
     difference between the upper and lower cobounds + 1
 
-##### `prif_image_index`
+### `prif_image_index`
 
-* **Description**: returns the index of the image identified by the coindices
-  provided in the `sub` argument with the given coarray on the identified team
-  or the current team if no team is identified
-* **Procedure Interface**:
+**Description**: returns the index of the image, on the identified team or the
+  current team if no team is provided, identified by the cosubscripts provided
+  in the `sub` argument with the given coarray handle
+    
 ```
 subroutine prif_image_index( &
     coarray_handle, sub, team, team_number, image_index)
@@ -914,43 +1017,51 @@ subroutine prif_image_index( &
   integer(c_int), intent(out) :: image_index
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`team` and `team_number`**: optional arguments that specify a team. They
-    shall not both be present in the same call.
-  * **`sub`**: A list of integers that identify a specific image in the
-    identified or current team when interpreted as coindices for the provided
-    coarray.
+**Further argument descriptions**:
 
-#### Access
+* **`team` and `team_number`**: optional arguments that specify a team. They
+  shall not both be present in the same call.
+* **`sub`**: A list of integers that identify a specific image in the
+  identified or current team when interpreted as cosubscripts for the provided
+  coarray handle.
 
-Coarray accesses will maintain serial dependencies for the issuing image. Any
+## Coarray Access
+
+The memory consistency semantics of coarray accesses follow those defined
+by the Image Execution Control section of the Fortran standard. In particular,
+coarray accesses will maintain serial dependencies for the issuing image. Any
 data access ordering between images is defined only with respect to ordered
-segments. Note that for put operations, "local completion" means that the provided
-arguments are no longer needed (e.g. their memory can be freed once the procedure
-has returned).
+segments. Note that for put operations, "source completion" means that the provided
+source locations are no longer needed (e.g. their memory can be freed once the procedure
+has returned). 
 
-##### Common Arguments
+### Common Arguments
 
-* **`notify_ptr`**: optional pointer on the identified image to the notify
+* **`notify_ptr`**: pointer on the identified image to the notify
   variable that should be updated on completion of the put operation. The
-  referenced variable shall be of type `prif_notify_type`. If this
-  argument is not present, no notification is performed.
+  referenced variable shall be of type `prif_notify_type`, and the storage
+  must have been allocated using `prif_allocate_coarray` or `prif_allocate`.
+  If this optional argument is omitted, then no notification is performed.
+
+* **`remote_ptr`**: pointer to where on the identified image the data begins.
+  The referenced storage must have been allocated using `prif_allocate_coarray` or `prif_allocate`.
 
-##### `prif_put`
+### `prif_put`
 
-* **Description**: This procedure assigns to the elements of a coarray, when the elements to be
-  assigned to are contiguous in linear memory on both sides. 
-  The compiler can use this to implement assignment to a `coindexed-object`. 
-  It need not call this procedure when the coarray reference is not a `coindexed-object`. 
-  This procedure blocks on local completion.
-* **Procedure Interface**:
+**Description**: This procedure assigns to the elements of a coarray, when the elements to be
+  assigned are contiguous in linear memory on both sides. 
+  The compiler can use this to implement assignment to a _coindexed-named-object_. 
+  It need not call this procedure when the coarray reference is not a _coindexed-named-object_. 
+  This procedure blocks on source completion. This procedure corresponds to a contiguous coarray
+  reference on the left hand side of an _assignment-stmt_.
+    
 ```
 subroutine prif_put( &
-    coarray_handle, coindices, value, first_element_addr, &
+    coarray_handle, cosubscripts, value, first_element_addr, &
     team, team_number, notify_ptr, stat, errmsg, errmsg_alloc)
   type(prif_coarray_handle), intent(in) :: coarray_handle
-  integer(c_intmax_t), intent(in) :: coindices(:)
-  type(*), dimension(..), intent(in), contiguous :: value
+  integer(c_intmax_t), intent(in) :: cosubscripts(:)
+  type(*), intent(in), contiguous, target :: value(..)
   type(c_ptr), intent(in) :: first_element_addr
   type(prif_team_type), optional, intent(in) :: team
   integer(c_intmax_t), optional, intent(in) :: team_number
@@ -960,21 +1071,22 @@ subroutine prif_put( &
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`first_element_addr`**: The address of the local data in the coarray
-    corresponding to the first element to be assigned to on the identified image
+**Further argument descriptions**:
+
+* **`first_element_addr`**: The address of the current image's data in the coarray
+  corresponding to the first element to be assigned to on the identified image
 
-##### `prif_put_raw`
+### `prif_put_raw`
 
-* **Description**: Assign to `size` number of bytes on given image, starting at
-  remote pointer, copying from local_buffer.
-* **Procedure Interface**:
+**Description**: Assign to `size` number of contiguous bytes on given image, starting at
+  `remote_ptr`, copying from `current_image_buffer`.
+    
 ```
 subroutine prif_put_raw( &
-    image_num, local_buffer, remote_ptr, notify_ptr, size, &
+    image_num, current_image_buffer, remote_ptr, notify_ptr, size, &
     stat, errmsg, errmsg_alloc)
   integer(c_int), intent(in) :: image_num
-  type(c_ptr), intent(in) :: local_buffer
+  type(c_ptr), intent(in) :: current_image_buffer
   integer(c_intptr_t), intent(in) :: remote_ptr
   integer(c_intptr_t), optional, intent(in) :: notify_ptr
   integer(c_size_t), intent(in) :: size
@@ -983,74 +1095,75 @@ subroutine prif_put_raw( &
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`image_num`**: identifies the image to be written to in the initial team
-  * **`local_buffer`**: pointer to the contiguous local data which should be copied to the
-    identified image. 
-  * **`remote_ptr`**: pointer to where on the identified image the data should be written
-  * **`size`**: how much data is to be transferred in bytes
+**Further argument descriptions**:
 
-##### `prif_put_raw_strided`
+* **`image_num`**: identifies the image to be written to in the initial team
+* **`current_image_buffer`**: pointer to the contiguous data which should be copied to the
+  identified image. 
+* **`size`**: how much data is to be transferred in bytes
 
-* **Description**: Assign to memory on given image, starting at
-  remote pointer, copying from local_buffer, progressing through local_buffer
-  in local_buffer_stride increments and through remote memory in remote_ptr_stride
-  increments, transferring extent number of elements in each dimension.
-* **Procedure Interface**:
+### `prif_put_raw_strided`
+
+**Description**: Assign to memory on given image, starting at
+  `remote_ptr`, copying from `current_image_buffer`, progressing through `current_image_buffer`
+  in `current_image_buffer_stride` increments and through remote memory in `remote_ptr_stride`
+  increments, transferring `extent` number of elements in each dimension.
+    
 ```
 subroutine prif_put_raw_strided( &
-    image_num, local_buffer, remote_ptr, element_size, extent, &
-    remote_ptr_stride, local_buffer_stride, notify_ptr, &
+    image_num, current_image_buffer, remote_ptr, element_size, extent, &
+    remote_ptr_stride, current_image_buffer_stride, notify_ptr, &
     stat, errmsg, errmsg_alloc)
   integer(c_int), intent(in) :: image_num
-  type(c_ptr), intent(in) :: local_buffer
+  type(c_ptr), intent(in) :: current_image_buffer
   integer(c_intptr_t), intent(in) :: remote_ptr
   integer(c_size_t), intent(in) :: element_size
   integer(c_size_t), intent(in) :: extent(:)
   integer(c_ptrdiff_t), intent(in) :: remote_ptr_stride(:)
-  integer(c_ptrdiff_t), intent(in) :: local_buffer_stride(:)
+  integer(c_ptrdiff_t), intent(in) :: current_image_buffer_stride(:)
   integer(c_intptr_t), optional, intent(in) :: notify_ptr
   integer(c_int), intent(out), optional :: stat
   character(len=*), intent(inout), optional :: errmsg
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-* **Further argument descriptions**:
-  * `remote_ptr_stride`, `local_buffer_stride` and `extent` must each have size
-    equal to the rank of the referenced coarray.
-  * **`image_num`**: identifies the image to be written to in the initial team
-  * **`local_buffer`**: pointer to the local data which should be copied to the
-    identified image.
-  * **`remote_ptr`**: pointer to where on the identified image the data should be written
-  * **`element_size`**: The size of each element in bytes
-  * **`extent`**: How many elements in each dimension should be transferred
-  * **`remote_ptr_stride`**: The stride (in units of bytes) between elements in
-    each dimension on the specified image. Each component of stride may
-    independently be positive or negative, but (together with `extent`) must
-    specify a region of distinct (non-overlapping) elements. The striding starts
-    at the `remote_ptr`.
-  * **`local_buffer_stride`**: The stride between elements in each dimension in
-    the local buffer. Each component of stride may independently be positive or
-    negative, but (together with `extent`) must specify a region of distinct
-    (non-overlapping) elements. The striding starts at the `local_buffer`.
-
-##### `prif_get`
-
-* **Description**: This procedure fetches data in a coarray from a specified image,
+**Further argument descriptions**:
+
+* `remote_ptr_stride`, `current_image_buffer_stride` and `extent` must each have size
+  equal to the rank of the referenced coarray.
+* **`image_num`**: identifies the image to be written to in the initial team
+* **`current_image_buffer`**: pointer to the data which should be copied to the
+  identified image.
+* **`element_size`**: The size of each element in bytes
+* **`extent`**: How many elements in each dimension should be transferred
+* **`remote_ptr_stride`**: The stride (in units of bytes) between elements in
+  each dimension on the specified image. Each component of stride may
+  independently be positive or negative, but (together with `extent`) must
+  specify a region of distinct (non-overlapping) elements. The striding starts
+  at the `remote_ptr`.
+* **`current_image_buffer_stride`**: The stride (in units of bytes) between elements in each dimension in
+  the current image buffer. Each component of stride may independently be positive or
+  negative, but (together with `extent`) must specify a region of distinct
+  (non-overlapping) elements. The striding starts at the `current_image_buffer`.
+
+### `prif_get`
+
+**Description**: This procedure fetches data in a coarray from a specified image,
   when the elements are contiguous in linear memory on both sides.
-  The compiler can use this to implement reads from a `coindexed-object`. 
-  It need not call this procedure when the coarray reference is not a `coindexed-object`. 
+  The compiler can use this to implement reads from a _coindexed-named-object_. 
+  It need not call this procedure when the coarray reference is not a _coindexed-named-object_. 
   This procedure blocks until the requested data has been successfully assigned
-  to the `value` argument.
-* **Procedure Interface**:
+  to the `value` argument. This procedure corresponds to any _coindexed-named-object_
+  reference that reads contiguous coarray data.
+    
 ```
 subroutine prif_get( &
-    coarray_handle, coindices, first_element_addr, value, team, team_number, &
-    stat, errmsg, errmsg_alloc)
+    coarray_handle, cosubscripts, first_element_addr, value, &
+    team, team_number, stat, errmsg, errmsg_alloc)
   type(prif_coarray_handle), intent(in) :: coarray_handle
-  integer(c_intmax_t), intent(in) :: coindices(:)
+  integer(c_intmax_t), intent(in) :: cosubscripts(:)
   type(c_ptr), intent(in) :: first_element_addr
-  type(*), dimension(..), intent(out), contiguous :: value
+  type(*), intent(inout), contiguous, target :: value(..)
   type(prif_team_type), optional, intent(in) :: team
   integer(c_intmax_t), optional, intent(in) :: team_number
   integer(c_int), intent(out), optional :: stat
@@ -1058,21 +1171,22 @@ subroutine prif_get( &
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`first_element_addr`**: The address of the local data in the coarray
-    corresponding to the first element to be fetched from the identified image
+**Further argument descriptions**:
+
+* **`first_element_addr`**: The address of the data in the coarray
+  corresponding to the first element to be fetched from the identified image
 
-##### `prif_get_raw`
+### `prif_get_raw`
 
-* **Description**: Fetch `size` number of contiguous bytes from given image, starting at
-  remote pointer, copying into local_buffer.
-* **Procedure Interface**:
+**Description**: Fetch `size` number of contiguous bytes from given image, starting at
+  `remote_ptr`, copying into `current_image_buffer`.
+    
 ```
 subroutine prif_get_raw( &
-    image_num, local_buffer, remote_ptr, size, &
+    image_num, current_image_buffer, remote_ptr, size, &
     stat, errmsg, errmsg_alloc)
   integer(c_int), intent(in) :: image_num
-  type(c_ptr), intent(in) :: local_buffer
+  type(c_ptr), intent(in) :: current_image_buffer
   integer(c_intptr_t), intent(in) :: remote_ptr
   integer(c_size_t), intent(in) :: size
   integer(c_int), intent(out), optional :: stat
@@ -1080,65 +1194,65 @@ subroutine prif_get_raw( &
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`image_num`**: identifies the image from which the data should be fetched
-    in the initial team
-  * **`local_buffer`**: pointer to the contiguous local memory into which the retrieved
-    data should be written
-  * **`remote_ptr`**: pointer to where on the identified image the data begins
-  * **`size`**: how much data is to be transferred in bytes
+**Further argument descriptions**:
 
-##### `prif_get_raw_strided`
+* **`image_num`**: identifies the image from which the data should be fetched
+  in the initial team
+* **`current_image_buffer`**: pointer to the contiguous memory into which the retrieved
+  data should be written
+* **`size`**: how much data is to be transferred in bytes
 
-* **Description**: Copy from given image, starting at remote pointer, writing
-  into local_buffer, progressing through local_buffer in local_buffer_stride
-  increments and through remote memory in remote_ptr_stride
-  increments, transferring extent number of elements in each dimension.
-* **Procedure Interface**:
+### `prif_get_raw_strided`
+
+**Description**: Copy from given image, starting at  `remote_ptr`, writing
+  into `current_image_buffer`, progressing through `current_image_buffer` in `current_image_buffer_stride`
+  increments and through remote memory in `remote_ptr_stride`
+  increments, transferring `extent` number of elements in each dimension.
+    
 ```
 subroutine prif_get_raw_strided( &
-    image_num, local_buffer, remote_ptr, element_size, extent, &
-    remote_ptr_stride, local_buffer_stride, &
+    image_num, current_image_buffer, remote_ptr, element_size, extent, &
+    remote_ptr_stride, current_image_buffer_stride, &
     stat, errmsg, errmsg_alloc)
   integer(c_int), intent(in) :: image_num
-  type(c_ptr), intent(in) :: local_buffer
+  type(c_ptr), intent(in) :: current_image_buffer
   integer(c_intptr_t), intent(in) :: remote_ptr
   integer(c_size_t), intent(in) :: element_size
   integer(c_size_t), intent(in) :: extent(:)
   integer(c_ptrdiff_t), intent(in) :: remote_ptr_stride(:)
-  integer(c_ptrdiff_t), intent(in) :: local_buffer_stride(:)
+  integer(c_ptrdiff_t), intent(in) :: current_image_buffer_stride(:)
   integer(c_int), intent(out), optional :: stat
   character(len=*), intent(inout), optional :: errmsg
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-* **Further argument descriptions**:
-  * `remote_ptr_stride`, `local_buffer_stride` and `extent` must each have size
-    equal to the rank of the referenced coarray.
-  * **`image_num`**: identifies the image from which the data should be fetched
-    in the initial team
-  * **`local_buffer`**: pointer to the local memory into which the retrieved
-    data should be written
-  * **`remote_ptr`**: pointer to where on the identified image the data begins
-  * **`element_size`**: The size of each element in bytes
-  * **`extent`**: How many elements in each dimension should be transferred
-  * **`remote_ptr_stride`**: The stride (in units of bytes) between elements in
-    each dimension on the specified image. Each component of stride may
-    independently be positive or negative, but (together with `extent`) must
-    specify a region of distinct (non-overlapping) elements. The striding starts
-    at the `remote_ptr`.
-  * **`local_buffer_stride`**: The stride between elements in each dimension in
-    the local buffer. Each component of stride may independently be positive or
-    negative, but (together with `extent`) must specify a region of distinct
-    (non-overlapping) elements. The striding starts at the `local_buffer`.
-
-### Synchronization
-
-#### `prif_sync_memory`
-
-* **Description**: Ends one segment and begins another, waiting on pending
+**Further argument descriptions**:
+
+* `remote_ptr_stride`, `current_image_buffer_stride` and `extent` must each have size
+  equal to the rank of the referenced coarray.
+* **`image_num`**: identifies the image from which the data should be fetched
+  in the initial team
+* **`current_image_buffer`**: pointer to the memory into which the retrieved
+  data should be written
+* **`element_size`**: The size of each element in bytes
+* **`extent`**: How many elements in each dimension should be transferred
+* **`remote_ptr_stride`**: The stride (in units of bytes) between elements in
+  each dimension on the specified image. Each component of stride may
+  independently be positive or negative, but (together with `extent`) must
+  specify a region of distinct (non-overlapping) elements. The striding starts
+  at the `remote_ptr`.
+* **`current_image_buffer_stride`**: The stride (in units of bytes) between elements in each dimension in
+  the current image buffer. Each component of stride may independently be positive or
+  negative, but (together with `extent`) must specify a region of distinct
+  (non-overlapping) elements. The striding starts at the `current_image_buffer`.
+
+## Synchronization
+
+### `prif_sync_memory`
+
+**Description**: Ends one segment and begins another, waiting on any pending
   communication operations with other images.
-* **Procedure Interface**:
+    
 ```
 subroutine prif_sync_memory(stat, errmsg, errmsg_alloc)
   integer(c_int), intent(out), optional :: stat
@@ -1147,10 +1261,10 @@ subroutine prif_sync_memory(stat, errmsg, errmsg_alloc)
 end subroutine
 ```
 
-#### `prif_sync_all`
+### `prif_sync_all`
 
-* **Description**: Performs a synchronization of all images in the current team.
-* **Procedure Interface**:
+**Description**: Performs a synchronization of all images in the current team.
+    
 ```
 subroutine prif_sync_all(stat, errmsg, errmsg_alloc)
   integer(c_int), intent(out), optional :: stat
@@ -1159,10 +1273,10 @@ subroutine prif_sync_all(stat, errmsg, errmsg_alloc)
 end subroutine
 ```
 
-#### `prif_sync_images`
+### `prif_sync_images`
 
-* **Description**: Performs a synchronization with the listed images.
-* **Procedure Interface**:
+**Description**: Performs a synchronization with the listed images.
+    
 ```
 subroutine prif_sync_images(image_set, stat, errmsg, errmsg_alloc)
   integer(c_int), intent(in), optional :: image_set(:)
@@ -1171,17 +1285,18 @@ subroutine prif_sync_images(image_set, stat, errmsg, errmsg_alloc)
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`image_set`**: The image inidices of the images in the current team with
-    which to synchronize. Note, if a scalar appears, the compiler should pass
-    its value as a size 1 array, and if an asterisk (`*`) appears, the compiler
-    should not pass `image_set`.
+**Further argument descriptions**:
+
+* **`image_set`**: The image inidices of the images in the current team with
+  which to synchronize. Given a scalar argument to SYNC IMAGES, the compiler should pass
+  its value in an array of size 1. Given an asterisk (`*`) argument to SYNC IMAGES, the compiler
+  should omit the `image_set` argument.
 
-#### `prif_sync_team`
+### `prif_sync_team`
 
-* **Description**: Performs a synchronization with the images of the identified
+**Description**: Performs a synchronization with the images of the identified
   team.
-* **Procedure Interface**:
+    
 ```
 subroutine prif_sync_team(team, stat, errmsg, errmsg_alloc)
   type(prif_team_type), intent(in) :: team
@@ -1190,18 +1305,19 @@ subroutine prif_sync_team(team, stat, errmsg, errmsg_alloc)
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`team`**: Identifies the team to synchronize.
+**Further argument descriptions**:
+
+* **`team`**: Identifies the team to synchronize.
 
-#### `prif_lock`
+### `prif_lock`
 
-* **Description**: Waits until the identified lock variable is unlocked
+**Description**: Waits until the identified lock variable is unlocked
   and then locks it if the `acquired_lock` argument is not present. Otherwise it
   sets the `acquired_lock` argument to `.false.` if the identified lock variable
   was locked, or locks the identified lock variable and sets the `acquired_lock`
-  argument to `.true.`. Note that if the identified lock variable was already
-  locked by the current image an error condition occurs.
-* **Procedure Interface**:
+  argument to `.true.`. If the identified lock variable was already
+  locked by the current image, then an error condition occurs.
+    
 ```
 subroutine prif_lock( &
     image_num, lock_var_ptr, acquired_lock, &
@@ -1214,21 +1330,23 @@ subroutine prif_lock( &
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`image_num`**: the image index in the initial team for the lock variable
-    to be locked
-  * **`lock_var_ptr`**: a pointer to the base address of the lock variable to
-    be locked on the identified image, typically obtained from a call to
-    `prif_base_pointer`
-  * **`acquired_lock`**: if present is set to `.true.` if the lock was locked
-    by the current image, or set to `.false.` otherwise
+**Further argument descriptions**:
 
-#### `prif_unlock`
+* **`image_num`**: the image index in the initial team for the lock variable
+  to be locked
+* **`lock_var_ptr`**: a pointer to the base address of the lock variable to
+  be locked on the identified image, typically obtained from a call to
+  `prif_base_pointer`. The referenced variable shall be of type `prif_lock_type`,
+  and the referenced storage must have been allocated using `prif_allocate_coarray` or `prif_allocate`.
+* **`acquired_lock`**: if present is set to `.true.` if the lock was locked
+  by the current image, or set to `.false.` otherwise
 
-* **Description**: Unlocks the identified lock variable. Note that if the
-  identified lock variable was not locked by the current image an error
+### `prif_unlock`
+
+**Description**: Unlocks the identified lock variable. If the
+  identified lock variable was not locked by the current image, then an error
   condition occurs.
-* **Procedure Interface**:
+    
 ```
 subroutine prif_unlock( &
     image_num, lock_var_ptr, stat, errmsg, errmsg_alloc)
@@ -1239,16 +1357,18 @@ subroutine prif_unlock( &
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`image_num`**: the image index in the initial team for the lock variable
-    to be unlocked
-  * **`lock_var_ptr`**: a pointer to the base address of the lock variable to
-    be unlocked on the identified image, typically obtained from a call to
-    `prif_base_pointer`
+**Further argument descriptions**:
+
+* **`image_num`**: the image index in the initial team for the lock variable
+  to be unlocked
+* **`lock_var_ptr`**: a pointer to the base address of the lock variable to
+  be unlocked on the identified image, typically obtained from a call to
+  `prif_base_pointer`. The referenced variable shall be of type `prif_lock_type`,
+  and the referenced storage must have been allocated using `prif_allocate_coarray` or `prif_allocate`.
 
-#### `prif_critical`
+### `prif_critical`
 
-* **Description**: The compiler shall define a coarray, and establish (allocate)
+**Description**: The compiler shall define a coarray, and establish (allocate)
   it in the initial team, that shall only be used to begin and end the critical
   block. An efficient implementation will likely define one for each critical
   block. The coarray shall be a scalar coarray of type `prif_critical_type` and
@@ -1256,7 +1376,7 @@ end subroutine
   procedure waits until any other image which has executed this procedure with
   a corresponding coarray handle has subsequently executed `prif_end_critical`
   with the same coarray handle an identical number of times.
-* **Procedure Interface**:
+    
 ```
 subroutine prif_critical( &
     critical_coarray, stat, errmsg, errmsg_alloc)
@@ -1266,30 +1386,32 @@ subroutine prif_critical( &
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`critical_coarray`**: the handle for the `prif_critical_type` coarray
-    associated with a given critical construct
+**Further argument descriptions**:
+
+* **`critical_coarray`**: the handle for the `prif_critical_type` coarray
+  associated with a given critical construct
 
-#### `prif_end_critical`
+### `prif_end_critical`
 
-* **Description**: Completes execution of the critical construct associated with
+**Description**: Completes execution of the critical construct associated with
   the provided coarray handle.
-* **Procedure Interface**:
+    
 ```
 subroutine prif_end_critical(critical_coarray)
   type(prif_coarray_handle), intent(in) :: critical_coarray
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`critical_coarray`**: the handle for the `prif_critical_type` coarray
-    associated with a given critical construct
+**Further argument descriptions**:
 
-### Events and Notifications
+* **`critical_coarray`**: the handle for the `prif_critical_type` coarray
+  associated with a given critical construct
 
-#### `prif_event_post`
+## Events and Notifications
 
-* **Description**: Atomically increment the count of the event variable by one.
-* **Procedure Interface**:
+### `prif_event_post`
+
+**Description**: Atomically increment the count of the event variable by one.
+    
 ```
 subroutine prif_event_post( &
     image_num, event_var_ptr, stat, errmsg, errmsg_alloc)
@@ -1300,83 +1422,93 @@ subroutine prif_event_post( &
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`image_num`**: the image index in the initial team for the event variable
-    to be incremented
-  * **`event_var_ptr`**: a pointer to the base address of the event variable to
-    be incremented on the identified image, typically obtained from a call to
-    `prif_base_pointer`
+**Further argument descriptions**:
+
+* **`image_num`**: the image index in the initial team for the event variable
+  to be incremented
+* **`event_var_ptr`**: a pointer to the base address of the event variable to
+  be incremented on the identified image, typically obtained from a call to
+  `prif_base_pointer`. The referenced variable shall be of type `prif_event_type`,
+  and the referenced storage must have been allocated using `prif_allocate_coarray` or `prif_allocate`.
 
-#### `prif_event_wait`
+### `prif_event_wait`
 
-* **Description**: Wait until the count of the provided event variable is greater
+**Description**: Wait until the count of the provided event variable on the calling image is greater
   than or equal to `until_count`, and then atomically decrement the count by that
   value. If `until_count` is not present it has the value 1.
-* **Procedure Interface**:
+    
 ```
 subroutine prif_event_wait( &
     event_var_ptr, until_count, stat, errmsg, errmsg_alloc)
-  integer(c_ptr), intent(in) :: event_var_ptr
+  type(c_ptr), intent(in) :: event_var_ptr
   integer(c_intmax_t), intent(in), optional :: until_count
   integer(c_int), intent(out), optional :: stat
   character(len=*), intent(inout), optional :: errmsg
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`event_var_ptr`**: a pointer to the event variable to be waited on
-  * **`until_count`**: the count of the given event variable to be waited for.
-    Has the value 1 if not provided.
+**Further argument descriptions**:
+
+* **`event_var_ptr`**: a pointer to the event variable to be waited on. The
+  referenced variable shall be of type `prif_event_type`,
+  and the referenced storage must have been allocated using `prif_allocate_coarray` or `prif_allocate`.
+* **`until_count`**: the count of the given event variable to be waited for.
+  Has the value 1 if not provided.
 
-#### `prif_event_query`
+### `prif_event_query`
 
-* **Description**: Query the count of an event.
-* **Procedure Interface**:
+**Description**: Query the count of an event variable on the calling image.
+    
 ```
 subroutine prif_event_query(event_var_ptr, count, stat)
-  integer(c_ptr), intent(in) :: event_var_ptr
+  type(c_ptr), intent(in) :: event_var_ptr
   integer(c_intmax_t), intent(out) :: count
   integer(c_int), intent(out), optional :: stat
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`event_var_ptr`**: a pointer to the event variable to be queried
-  * **`count`**: the current count of the given event variable.
+**Further argument descriptions**:
 
-#### `prif_notify_wait`
+* **`event_var_ptr`**: a pointer to the event variable to be queried. The
+    referenced variable shall be of type `prif_event_type`,
+    and the referenced storage must have been allocated using `prif_allocate_coarray` or `prif_allocate`.
+* **`count`**: the current count of the given event variable.
 
-* **Description**: Wait on notification of a put operation
-* **Procedure Interface**:
+### `prif_notify_wait`
+
+**Description**: Wait on notification of an incoming put operation
+    
   ```
     subroutine prif_notify_wait( &
         notify_var_ptr, until_count, stat, errmsg, errmsg_alloc)
-      integer(c_ptr), intent(in) :: notify_var_ptr
+      type(c_ptr), intent(in) :: notify_var_ptr
       integer(c_intmax_t), intent(in), optional :: until_count
       integer(c_int), intent(out), optional :: stat
       character(len=*), intent(inout), optional :: errmsg
       character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
     end subroutine
   ```
-* **Further argument descriptions**:
-  * **`notify_var_ptr`**: a pointer to the notify variable to be waited on. The
-  referenced variable shall be of type `prif_notify_type`.
-  * **`until_count`**: the count of the given notify variable to be waited for.
-    Has the value 1 if not provided.
+**Further argument descriptions**:
+
+* **`notify_var_ptr`**: a pointer to the notify variable on the calling image to be waited on. The
+  referenced variable shall be of type `prif_notify_type`,
+  and the referenced storage must have been allocated using `prif_allocate_coarray` or `prif_allocate`.
+* **`until_count`**: the count of the given notify variable to be waited for.
+  Has the value 1 if not provided.
 
-### Teams
+## Teams
 
 Team creation forms a tree structure, where a given team may create multiple
 child teams. The initial team is created by the `prif_init` procedure. Each
-subsequently created team's parent team is then the current team. Team
+subsequently created team's parent is the then-current team. Team
 membership is thus strictly hierarchical, following a single path along the
 tree formed by team creation.
 
-#### `prif_form_team`
+### `prif_form_team`
 
-* **Description**: Create teams. Each image receives a team value denoting the
+**Description**: Create teams. Each image receives a team value denoting the
   newly created team containing all images in the current team which specify the
   same value for `team_number`.
-* **Procedure Interface**:
+    
 ```
 subroutine prif_form_team( &
     team_number, team, new_index, stat, errmsg, errmsg_alloc)
@@ -1388,32 +1520,34 @@ subroutine prif_form_team( &
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`new_index`**: the index that the current image will have in its new team
+**Further argument descriptions**:
+
+* **`new_index`**: the index that the current image will have in its new team
 
-#### `prif_get_team`
+### `prif_get_team`
 
-* **Description**: Get the team value for the current or an ancestor team. It
+**Description**: Get the team value for the current or an ancestor team. It
   returns the current team if `level` is not present or has the value
   `PRIF_CURRENT_TEAM`, the parent team if `level` is present with the
   value `PRIF_PARENT_TEAM`, or the initial team if `level` is present with the value
   `PRIF_INITIAL_TEAM`
-* **Procedure Interface**:
+    
 ```
 subroutine prif_get_team(level, team)
   integer(c_int), intent(in), optional :: level
   type(prif_team_type), intent(out) :: team
 end subroutine
 ```
-* **Further argument descriptions**:
-  * **`level`**: identify which team value to be returned
+**Further argument descriptions**:
 
-#### `prif_team_number`
+* **`level`**: identify which team value to be returned
 
-* **Description**: Return the `team_number` that was specified in the call to
+### `prif_team_number`
+
+**Description**: Return the `team_number` that was specified in the call to
   `prif_form_team` for the specified team, or -1 if the team is the initial
   team. If `team` is not present, the current team is used.
-* **Procedure Interface**:
+    
 ```
 subroutine prif_team_number(team, team_number)
   type(prif_team_type), intent(in), optional :: team
@@ -1421,14 +1555,14 @@ subroutine prif_team_number(team, team_number)
 end subroutine
 ```
 
-#### `prif_change_team`
+### `prif_change_team`
 
-* **Description**: changes the current team to the specified team. For any
+**Description**: changes the current team to the specified team. For any
   associate names specified in the `CHANGE TEAM` statement the compiler should
   follow a call to this procedure with calls to `prif_alias_create` to create
   the alias coarray handle, and associate any non-coindexed references to the
   associate name within the `CHANGE TEAM` construct with the selector.
-* **Procedure Interface**:
+    
 ```
 subroutine prif_change_team(team, stat, errmsg, errmsg_alloc)
   type(prif_team_type), intent(in) :: team
@@ -1438,14 +1572,14 @@ subroutine prif_change_team(team, stat, errmsg, errmsg_alloc)
 end subroutine
 ```
 
-#### `prif_end_team`
+### `prif_end_team`
 
-* **Description**: Changes the current team to the parent team. During the
-  execution of `prif_end_team`, the PRIF implementation will deallocate any coarrays allocated during the
+**Description**: Changes the current team to the parent team. During the
+  execution of `prif_end_team`, the PRIF implementation will deallocate any coarrays that became allocated during the
   change team construct. Prior to invoking `prif_end_team`, the compiler is
-  responsible for invoking `prif_alias_destroy` for any `prif_coarray_handle`
-  handles created as part of the `change team` statement.
-* **Procedure Interface**:
+  responsible for invoking `prif_alias_destroy` to delete any `prif_coarray_handle`
+  aliases created as part of the `CHANGE TEAM` construct.
+    
 ```
 subroutine prif_end_team(stat, errmsg, errmsg_alloc)
   integer(c_int), intent(out), optional :: stat
@@ -1454,32 +1588,32 @@ subroutine prif_end_team(stat, errmsg, errmsg_alloc)
 end subroutine
 ```
 
-### Collectives
+## Collectives
 
-#### Common arguments
+### Common Arguments
 
 * **`a`**
   * Argument for all the collective subroutines: [`prif_co_broadcast`](#prif_co_broadcast),
     [`prif_co_max`](#prif_co_max), [`prif_co_min`](#prif_co_min),
     [`prif_co_reduce`](#prif_co_reduce), [`prif_co_sum`](#prif_co_sum),
-  * may be any type for `co_broadcast` or `co_reduce`, any numeric for `co_sum`,
-    and integer, real, or character for `co_min` or `co_max`
+  * may be any type for `prif_co_broadcast` or `prif_co_reduce`, any numeric for `prif_co_sum`,
+    and integer, real, or character for `prif_co_min` or `prif_co_max`
   * is always `intent(inout)`
-  * for `co_max`, `co_min`, `co_reduce`, `co_sum` it is assigned the value
+  * for `prif_co_max`, `prif_co_min`, `prif_co_reduce`, `prif_co_sum` it is assigned the value
     computed by the collective operation, if no error conditions occurs and if
     `result_image` is absent, or the executing image is the one identified by
     `result_image`, otherwise `a` becomes undefined
-  * for `co_broadcast`, the value of the argument on the `source_image` is
+  * for `prif_co_broadcast`, the value of the argument on the `source_image` is
     assigned to the `a` argument on all other images
 
 * **`source_image` or `result_image`**
-  * These arguments are of type `integer(c_int)`, to minimize the frequency
-    that integer conversions will be needed.
+  * Identifies the image in the current team that is the root of the collective operation.
+  * If `result_image` is omitted, then all participating images receive the resulting value.
 
-#### `prif_co_broadcast`
+### `prif_co_broadcast`
 
-* **Description**: Broadcast value to images
-* **Procedure Interface**:
+**Description**: Broadcast value to images
+    
 ```
 subroutine prif_co_broadcast( &
     a, source_image, stat, errmsg, errmsg_alloc)
@@ -1491,10 +1625,10 @@ subroutine prif_co_broadcast( &
 end subroutine
 ```
 
-#### `prif_co_max`
+### `prif_co_max`
 
-* **Description**: Compute maximum value across images
-* **Procedure Interface**:
+**Description**: Compute maximum value across images
+    
 ```
 subroutine prif_co_max( &
     a, result_image, stat, errmsg, errmsg_alloc)
@@ -1506,10 +1640,10 @@ subroutine prif_co_max( &
 end subroutine
 ```
 
-#### `prif_co_min`
+### `prif_co_min`
 
-* **Description**: Compute minimum value across images
-* **Procedure Interface**:
+**Description**: Compute minimum value across images
+    
 ```
 subroutine prif_co_min( &
     a, result_image, stat, errmsg, errmsg_alloc)
@@ -1521,10 +1655,10 @@ subroutine prif_co_min( &
 end subroutine
 ```
 
-#### `prif_co_reduce`
+### `prif_co_reduce`
 
-* **Description**: Generalized reduction across images
-* **Procedure Interface**:
+**Description**: Generalized reduction across images
+    
 ```
 subroutine prif_co_reduce( &
     a, operation, result_image, stat, errmsg, errmsg_alloc)
@@ -1536,11 +1670,17 @@ subroutine prif_co_reduce( &
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
+**Further argument descriptions**:
+
+* **`operation`**: the result of `C_FUNLOC` on a reduction operation procedure that meets the 
+  requirements outlined in the Fortran standard for the corresponding argument to CO_REDUCE.
+  Note the procedure itself need NOT be interoperable (i.e. `BIND(C)`) nor are the
+  arguments required to have interoperable types.
 
-#### `prif_co_sum`
+### `prif_co_sum`
 
-* **Description**: Compute sum across images
-* **Procedure Interface**:
+**Description**: Compute sum across images
+    
 ```
 subroutine prif_co_sum( &
     a, result_image, stat, errmsg, errmsg_alloc)
@@ -1552,11 +1692,12 @@ subroutine prif_co_sum( &
 end subroutine
 ```
 
-### Atomic Memory Operation
+## Atomic Memory Operations
 
-All atomic operations are blocking operations.
+All atomic operations are fully blocking operations, meaning they do not return to the caller
+until after all semantics involving the atomic variable are fully committed with respect to all images.
 
-#### Common arguments
+### Common Arguments
 
 * **`atom_remote_ptr`**
   * Argument for all of the atomic subroutines
@@ -1564,20 +1705,24 @@ All atomic operations are blocking operations.
   * is the location of the atomic variable on the identified image to be
     operated on
   * it is the responsibility of the compiler to perform the necessary operations
-    on the coarray or coindexed actual argument to get the relevant remote pointer
+    on the coarray or coindexed actual argument to compute the relevant remote pointer
+  * The referenced storage must have been allocated using `prif_allocate_coarray` or `prif_allocate`.
+
 * **`image_num`**
-  * identifies the image on which the atomic operation is to be performed
-  * is the image index in the initial team
+  * an argument identifying the image to be communicated with
+  * is permitted to identify the current image
+  * the image index is always relative to the initial team, unless otherwise specified
 
-#### Non-fetching Atomic Operations
+### Non-Fetching Atomic Operations
 
-Perform specified operation on a variable in a coarray atomically.
+**Description**: Each of the following procedures atomically performs the 
+specified operation on a variable in a coarray.
 
-##### Common argument
+#### Common Argument
 
 * **`value`**: value to perform the operation with
 
-##### `prif_atomic_add`, Addition
+#### `prif_atomic_add`, Addition
 
 ```
 subroutine prif_atomic_add(atom_remote_ptr, image_num, value, stat)
@@ -1588,7 +1733,7 @@ subroutine prif_atomic_add(atom_remote_ptr, image_num, value, stat)
 end subroutine
 ```
 
-##### `prif_atomic_and`, Bitwise And
+#### `prif_atomic_and`, Bitwise And
 
 ```
 subroutine prif_atomic_and(atom_remote_ptr, image_num, value, stat)
@@ -1599,7 +1744,7 @@ subroutine prif_atomic_and(atom_remote_ptr, image_num, value, stat)
 end subroutine
 ```
 
-##### `prif_atomic_or`, Bitwise Or
+#### `prif_atomic_or`, Bitwise Or
 
 ```
 subroutine prif_atomic_or(atom_remote_ptr, image_num, value, stat)
@@ -1610,7 +1755,7 @@ subroutine prif_atomic_or(atom_remote_ptr, image_num, value, stat)
 end subroutine
 ```
 
-##### `prif_atomic_xor`, Bitwise Xor
+#### `prif_atomic_xor`, Bitwise Xor
 
 ```
 subroutine prif_atomic_xor(atom_remote_ptr, image_num, value, stat)
@@ -1621,17 +1766,18 @@ subroutine prif_atomic_xor(atom_remote_ptr, image_num, value, stat)
 end subroutine
 ```
 
-#### Atomic Fetch Operations
+### Fetching Atomic Operations
 
-Perform specified operation on a variable in a coarray atomically and save its
+**Description**: Each of the following procedures atomically performs the 
+specified operation on a variable in a coarray, and retrieves the
 original value.
 
-##### Common arguments
+#### Common Arguments
 
 * **`value`**: value to perform the operation with
 * **`old`**: is set to the initial value of the atomic variable
 
-##### `prif_atomic_fetch_add`, Addition
+#### `prif_atomic_fetch_add`, Addition
 
 ```
 subroutine prif_atomic_fetch_add( &
@@ -1644,7 +1790,7 @@ subroutine prif_atomic_fetch_add( &
 end subroutine
 ```
 
-##### `prif_atomic_fetch_and`, Bitwise And
+#### `prif_atomic_fetch_and`, Bitwise And
 
 ```
 subroutine prif_atomic_fetch_and( &
@@ -1657,7 +1803,7 @@ subroutine prif_atomic_fetch_and( &
 end subroutine
 ```
 
-##### `prif_atomic_fetch_or`, Bitwise Or
+#### `prif_atomic_fetch_or`, Bitwise Or
 
 ```
 subroutine prif_atomic_fetch_or( &
@@ -1670,7 +1816,7 @@ subroutine prif_atomic_fetch_or( &
 end subroutine
 ```
 
-##### `prif_atomic_fetch_xor`, Bitwise Xor
+#### `prif_atomic_fetch_xor`, Bitwise Xor
 
 ```
 subroutine prif_atomic_fetch_xor( &
@@ -1683,16 +1829,17 @@ subroutine prif_atomic_fetch_xor( &
 end subroutine
 ```
 
-#### Atomic Access
+### Atomic Access
 
-Atomically set or retrieve the value of an atomic variable in a coarray.
+**Description**: The following procedures atomically 
+set or retrieve the value of a variable in a coarray.
 
-##### Common argument
+#### Common Argument
 
 * **`value`**: value to which the variable shall be set, or retrieved from the
   variable
 
-##### `prif_atomic_define`, set variable's value
+#### `prif_atomic_define`, set variable's value
 
 ```
 interface prif_atomic_define
@@ -1714,7 +1861,7 @@ interface prif_atomic_define
 end interface
 ```
 
-##### `prif_atomic_ref`, retrieve variable's value
+#### `prif_atomic_ref`, retrieve variable's value
 
 ```
 interface prif_atomic_ref
@@ -1736,11 +1883,13 @@ interface prif_atomic_ref
 end interface
 ```
 
-##### `prif_atomic_cas`, Compare and Swap
+### `prif_atomic_cas`
 
+**Description**: Performs an atomic compare-and-swap operation.
 If the value of the atomic variable is equal to the value of the `compare`
 argument, set it to the value of the `new` argument. The `old` argument is set
 to the initial value of the atomic variable.
+    
 
 ```
 interface prif_atomic_cas
@@ -1765,17 +1914,29 @@ interface prif_atomic_cas
   end subroutine
 end interface
 ```
-* **Further argument descriptions**:
-  * **`old`**: is set to the initial value of the atomic variable
-  * **`compare`**: the value with which to compare the atomic variable
-  * **`new`**: the value to set the atomic variable too if it is initially equal
-    to the `compare` argument
+**Further argument descriptions**:
 
+* **`old`**: is set to the initial value of the atomic variable
+* **`compare`**: the value with which to compare the atomic variable
+* **`new`**: the value to assign into the atomic variable, if it is initially equal
+  to the `compare` argument
+
+# Glossary
+
+* **Client Note**: a note that is relevant information for compiler developers who are clients of the PRIF interface
+
+* **Implementation Note**: a note that is relevant information for runtime
+  library developers who are implementing the PRIF interface
+
+* **Source Completion**: The source-side resources provided to a
+  communication operation by this image are no longer in use by
+  the PRIF implementation, and the client is now permitted to modify
+  or reclaim them.
 
 # Future Work
 
 At present all communication operations are semantically blocking on at least
-local completion. We acknowledge that this prohibits certain types of static
+source completion. We acknowledge that this prohibits certain types of static
 optimization, namely the explicit overlap of communication with computation. In
 the future we intend to develop split-phased/asynchronous versions of various
 communication operations to enable more opportunities for static optimization of
@@ -1792,6 +1953,10 @@ Computing Center (NERSC), a U.S. Department of Energy Office of Science User
 Facility located at Lawrence Berkeley National Laboratory, operated under
 Contract No. DE-AC02-05CH11231
 
+The authors would like to thank Etienne Renault and Jean-Didier Pailleux of
+SiPearl for providing helpful comments and suggestions regarding an earlier
+revision of this specification.
+
 # Copyright
 
 This work is licensed under [CC BY-ND](https://creativecommons.org/licenses/by-nd/4.0/)

>From 26e1ed55d18a4e6e06dbdf1cdb1b10d9c1e1ebd6 Mon Sep 17 00:00:00 2001
From: Brad Richardson <everythingfunctional at protonmail.com>
Date: Wed, 17 Jul 2024 12:19:33 -0500
Subject: [PATCH 3/4] Update PRIF design doc to Revision 0.4

* Changes to Coarray Access (puts and gets):
  - Refactor to provide separate procedure interfaces for the various combinations of:
    direct vs indirect target location, puts with or without a *notify-variable*,
    direct vs indirect *notify-variable* location, and strided vs contiguous data access.
  - Add discussion of direct and indirect location accesses to
    the Design Decisions and Impact section
  - Rename `_raw_` procedures to `_indirect_`
  - Replace `cosubscripts`, `team`, and `team_number` arguments with `image_num`
  - Replace `first_element_addr` arguments with `offset`
  - Replace `type(*)` `value` arguments with `size` and `current_image_buffer`
  - Rename `remote_ptr_stride` arguments to `remote_stride`
  - Rename `current_image_buffer_stride` arguments to `current_image_stride`
  - Rename `size` arguments to `size_in_bytes`

* Other changes to PRIF procedure interfaces:
  - Establish a new uniform argument ordering across all non-collective
    communication procedures
  - Remove `prif_base_pointer`. Direct access procedures should be used instead.
  - Add direct versions of `prif_event_post`, `prif_lock`, and
   `prif_unlock` and rename previous versions to `..._indirect`
  - Convert `prif_num_images` into three different procedures with no
    optional arguments, in order to more closely align with the
    Fortran standard. Do the same with `prif_image_index`.
  - Correct the kind for atomic procedures from `atomic_int_kind` to `PRIF_ATOMIC_INT_KIND`
    and from `atomic_logical_kind` to `PRIF_ATOMIC_LOGICAL_KIND`
  - Remove target attribute from `coarray_handles` argument in `prif_deallocate_coarray`
  - Rename `element_length` argument in `prif_allocate_coarray` to `element_size`
  - Rename `image_index` argument in `prif_this_image_no_coarray` to `this_image`
  - Remove generic interfaces throughout

* Miscellaneous new features:
  - Allow multiple calls to `prif_init` from each process, and add
    `PRIF_STAT_ALREADY_INIT` constant
  - Add new PRIF-specific constants `PRIF_VERSION_MAJOR` and `PRIF_VERSION_MINOR`

* Narrative and editorial improvements:
  - Add/improve Common Arguments subsections and add links to them
    below procedure interfaces
  - Elide argument lists for all procedures and add prose explaining
    how the PRIF specification presents the procedure interfaces
  - Add client notes to subsections introducing PRIF Types, and permute subsection order
  - Add guidance to clients regarding coarray dummy arguments
  - Remove grammar non-terminals, including `coindexed-named-object`
  - Add several terms to the glossary
  - Numerous minor wording changes throughout

Co-authored-by: Katherine Rasmussen <krasmussen at lbl.gov>
Co-authored-by: Dan Bonachea <dobonachea at lbl.gov>
Co-authored-by: Damian Rouson <rouson at lbl.gov>
---
 flang/docs/ParallelFortranRuntime.md | 1756 +++++++++++++++++---------
 1 file changed, 1164 insertions(+), 592 deletions(-)

diff --git a/flang/docs/ParallelFortranRuntime.md b/flang/docs/ParallelFortranRuntime.md
index fedb4b1dfdc05d..75d1a097872c2c 100644
--- a/flang/docs/ParallelFortranRuntime.md
+++ b/flang/docs/ParallelFortranRuntime.md
@@ -1,11 +1,11 @@
-<!--===- docs/CoarrayFortranRuntime.md
+<!--===- ParallelFortranRuntime.md
 
-   Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-   See https://llvm.org/LICENSE.txt for license information.
-   SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+   Distributed with the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+   See [Copyright](#copyright) for document license information.
+   SPDX-License-Identifier: CC-BY-ND-4.0
 
 -->
-# Parallel Runtime Interface for Fortran (PRIF) Specification, Revision 0.3
+# Parallel Runtime Interface for Fortran (PRIF) Specification, Revision 0.4
 
 Dan Bonachea  
 Katherine Rasmussen  
@@ -36,7 +36,6 @@ interfaces, including argument attributes.
 > **WORK IN PROGRESS** This document is still a draft and may continue to evolve.    
 > Feedback and questions should be directed to: <fortran at lbl.gov>
 
-\newpage
 # Change Log
 
 ## Revision 0.1
@@ -88,12 +87,60 @@ interfaces, including argument attributes.
 * Update `coindexed-object` references to _coindexed-named-object_ to match
   the term change in the most recent Fortran 2023 standard
 * Convert several explanatory sections to "Notes"
-* Add implementation note about the PRIF API being defined in Fortran
+* Add implementation note about PRIF being defined in Fortran
 * Add section "How to read the PRIF specification"
 * Add section "Glossary"
 * Improve description of the `final_func` arg to `prif_allocate_coarray`
   and move some of previous description to a client note.
 
+## Revision 0.4 (July 2024)
+
+* Changes to Coarray Access (puts and gets):
+  - Refactor to provide separate procedure interfaces for the various combinations of: 
+    direct vs indirect target location, puts with or without a *notify-variable*, 
+    direct vs indirect *notify-variable* location, and strided vs contiguous data access.
+  - Add discussion of direct and indirect location accesses to
+    the Design Decisions and Impact section
+  - Rename `_raw_` procedures to `_indirect_`
+  - Replace `cosubscripts`, `team`, and `team_number` arguments with `image_num` 
+  - Replace `first_element_addr` arguments with `offset` 
+  - Replace `type(*)` `value` arguments with `size` and `current_image_buffer`
+  - Rename `remote_ptr_stride` arguments to `remote_stride`
+  - Rename `current_image_buffer_stride` arguments to `current_image_stride`
+  - Rename `size` arguments to `size_in_bytes`
+
+* Other changes to PRIF procedure interfaces:
+  - Establish a new uniform argument ordering across all non-collective
+    communication procedures
+  - Remove `prif_base_pointer`. Direct access procedures should be used instead.
+  - Add direct versions of `prif_event_post`, `prif_lock`, and
+   `prif_unlock` and rename previous versions to `..._indirect`
+  - Convert `prif_num_images` into three different procedures with no
+    optional arguments, in order to more closely align with the
+    Fortran standard. Do the same with `prif_image_index`.
+  - Correct the kind for atomic procedures from `atomic_int_kind` to `PRIF_ATOMIC_INT_KIND`
+    and from `atomic_logical_kind` to `PRIF_ATOMIC_LOGICAL_KIND`
+  - Remove target attribute from `coarray_handles` argument in `prif_deallocate_coarray`
+  - Rename `element_length` argument in `prif_allocate_coarray` to `element_size`
+  - Rename `image_index` argument in `prif_this_image_no_coarray` to `this_image`
+  - Remove generic interfaces throughout
+
+* Miscellaneous new features:
+  - Allow multiple calls to `prif_init` from each process, and add
+    `PRIF_STAT_ALREADY_INIT` constant 
+  - Add new PRIF-specific constants `PRIF_VERSION_MAJOR` and `PRIF_VERSION_MINOR`
+
+* Narrative and editorial improvements:
+  - Add/improve Common Arguments subsections and add links to them
+    below procedure interfaces
+  - Elide argument lists for all procedures and add prose explaining
+    how the PRIF specification presents the procedure interfaces
+  - Add client notes to subsections introducing PRIF Types, and permute subsection order
+  - Add guidance to clients regarding coarray dummy arguments
+  - Remove grammar non-terminals, including `coindexed-named-object`
+  - Add several terms to the glossary
+  - Numerous minor wording changes throughout
+
 \newpage
 # Problem Description
 
@@ -111,9 +158,10 @@ subroutines, functions, types, and kind type parameters:
   - _Failed images:_ `FAIL IMAGE`
   - _Teams:_ `FORM TEAM`, `CHANGE TEAM`
   - _Critical sections:_ `CRITICAL`, `END CRITICAL`
-* **Intrinsic functions:** `NUM_IMAGES`, `THIS_IMAGE`, `LCOBOUND`, `UCOBOUND`,
-  `TEAM_NUMBER`, `GET_TEAM`, `FAILED_IMAGES`, `STOPPED_IMAGES`, `IMAGE_STATUS`,
-  `COSHAPE`, `IMAGE_INDEX`
+* **Intrinsic functions:** 
+  - _Image Queries:_ `NUM_IMAGES`, `THIS_IMAGE`, `FAILED_IMAGES`, `STOPPED_IMAGES`, `IMAGE_STATUS`
+  - _Coarray Queries:_ `LCOBOUND`, `UCOBOUND`, `COSHAPE`, `IMAGE_INDEX`
+  - _Teams:_ `TEAM_NUMBER`, `GET_TEAM`
 * **Intrinsic subroutines:**
   - _Collective subroutines:_ `CO_SUM`, `CO_MAX`, `CO_MIN`, `CO_REDUCE`, `CO_BROADCAST`
   - _Atomic subroutines:_ `ATOMIC_ADD`, `ATOMIC_AND`, `ATOMIC_CAS`,
@@ -135,18 +183,18 @@ that pre-existed parallelism in standard Fortran:
 
 * **Image control statements:**
   - _Pre-existing statements_: `ALLOCATE`, `DEALLOCATE`, `STOP`, `END`,
-    a `CALL` to `MOVE_ALLOC` with coarray arguments
+    `MOVE_ALLOC` on coarray
   - _New statements:_ `SYNC ALL`, `SYNC IMAGES`, `SYNC MEMORY`, `SYNC TEAM`,
     `CHANGE TEAM`, `END TEAM`, `CRITICAL`, `END CRITICAL`, `EVENT POST`,
     `EVENT WAIT`, `FORM TEAM`, `LOCK`, `UNLOCK`, `NOTIFY WAIT`
 
-One consequence of the statements being categorized as image control statements
+One consequence of these statements being categorized as image control statements
 will be the need to restrict code movement by optimizing compilers.
 
 # Proposed Solution
 
 This specification proposes an interface to support the above features,
-named Parallel Runtime Interface for Fortran (PRIF). By defining an
+named the Parallel Runtime Interface for Fortran (PRIF). By defining an
 implementation-agnostic interface, we envision facilitating the development of
 alternative parallel runtime libraries that support the same interface. One
 benefit of this approach is the ability to vary the communication substrate.
@@ -197,7 +245,7 @@ for the list of PRIF implementation procedures that the compiler will invoke.
 |                                                                                                                                  |                    |                     |
 | Intrinsics related to parallelism, eg. `NUM_IMAGES`, `COSHAPE`, `IMAGE_INDEX`                                                    |                    |          X          |
 | Allocate and deallocate a coarray                                                                                                |                    |          X          |
-| Reference a _coindexed-named-object_                                                                                             |                    |          X          |
+| Reference a coindexed object                                                                                                     |                    |          X          |
 | Team statements/constructs: `FORM TEAM`, `CHANGE TEAM`, `END TEAM`                                                                |                    |          X          |
 | Team stack abstraction                                                                                                           |                    |          X          |
 | Track coarrays for implicit deallocation at `END TEAM`                                                                           |                    |          X          |
@@ -213,6 +261,81 @@ for the list of PRIF implementation procedures that the compiler will invoke.
 | ---------------- |
 | Implementations for much of the Parallel Runtime Interface for Fortran exist in [Caffeine], a parallel runtime library supporting coarray Fortran compilers. Caffeine will continue to be developed in order to fully implement PRIF. Caffeine targets the [GASNet-EX] exascale networking middleware, however PRIF is deliberately agnostic to details of the communication substrate. As such it should be possible to develop PRIF implementations targeting other substrates including the Message Passing Interface ([MPI]). |
 
+## Design Decisions and Impact
+
+As stated earlier, PRIF specifies a set of **Fortran** types, values, and procedure
+interfaces, all provided by the PRIF implementation in the `prif` Fortran module. 
+This means that a compiler will typically need to transform Fortran
+code making use of the parallel features as though it had been written to use
+PRIF directly. Conceptually this could happen as a source-to-source transformation,
+but in practice it's expected to happen in later phases of processing. It is worth further
+noting that whilst an implementation of PRIF defines the contents of the PRIF types
+and the values of the named constants, because PRIF is a Fortran module, a compiler
+should have access to their definitions during code compilation in the same way
+as other Fortran modules. This also has the consequence that different PRIF
+implementations will likely not be ABI compatible.
+
+The PRIF design gives the responsibility of defining the handle for coarray data
+(`prif_coarray_handle`) to the PRIF implementation. The compiler is then responsible for storing and passing
+the handle back to the implementation for operations involving that coarray. For
+Fortran procedures with coarray dummy arguments, this means that the compiler
+should ensure that the coarray handle corresponding to the actual argument is
+made available for use in coarray operations within the procedure. This could
+be achieved by passing the handle as an extra argument, or by including the
+handle in the variable's descriptor.
+
+Many of the PRIF procedures providing communication involving coindexed data have direct and indirect
+variants. The direct variants accept a coarray handle as an argument and can
+operate on data stored within the coarray, i.e. memory locations allocated using
+`prif_allocate_corray`. The indirect variants accept a pointer instead,
+and are used for operating on data which is not necessarily stored directly within
+a coarray, i.e. the memory location was either allocated using `prif_allocate`, or is
+being accessed through a pointer component in a different coarray. Note
+that for `put` operations, the target location of the coindexed assignment and the notify
+variable to be modified upon completion can independently be direct or indirect.
+The pointer to an indirect location will typically be obtained using `prif_get*`
+to retrieve pointer information from the representation of an allocatable or
+pointer component of some derived type stored within a coarray.
+
+The distinction between direct and indirect access is necessitated by the fact
+that coarrays are permitted to be of derived types with allocatable or pointer
+components. Unlike the coarray data, the target memory referenced by these components 
+is generally allocated non-collectively, and those allocations can occur before or after
+the collective allocation of the coarray. Nevertheless, Fortran requires this target 
+memory to be accessible to remote images.
+Consider the below program as an example.
+
+```
+program coarray_with_allocatable_component
+  type :: my_type
+    integer, allocatable :: component
+  end type
+  type(my_type) :: coarray[*]
+  if (this_image() == 1) then 
+      allocate(coarray%component, source = 42)
+  endif
+  sync all
+  print *, coarray[1]%component
+end program
+```
+
+It is also valid for a pointer component in one coarray to reference data stored
+in another coarray. Consider the below program as an example.
+
+```
+program coarray_with_pointer_component
+  type :: my_pointer
+    integer, pointer :: val
+  end type
+  integer, target :: i[*]
+  type(my_pointer) :: j[*]
+  i = this_image()
+  j%val => i
+  sync all
+  print *, j[1]%val
+end program
+```
+
 ## How to read the PRIF specification
 
 The following types and procedures align with corresponding types and procedures
@@ -221,17 +344,17 @@ For example, the PRIF procedure `prif_num_images` corresponds to the intrinsic f
 `NUM_IMAGES` that is defined in the Fortran standard. In other cases, the correspondence
 may be less clear and is stated explicitly.
 
-In order to avoid redundancy, some details are not included below as the corresponding
-descriptions in the Fortran standard contain the detailed descriptions of what is
-required by the language. For example, this document references the term _coindexed-named-object_
+In order to avoid redundancy, some details are omitted from this document, because the corresponding
+descriptions in the Fortran standard contain the detailed specification of concepts and behavior
+required by the language. For example, this document references the term coarray
 multiple times, but does not define it since it is part of the language and the Fortran
 standard defines it. As such, in order to fully understand the PRIF specification, it is
 critical to read and reference the Fortran standard alongside it. Additionally, the
 descriptions in the PRIF specification use similar language to the language used in the
-Fortran standard, such as terms like ‘shall’.” Where PRIF uses terms not defined in
+Fortran standard, for example terms like "shall". Where PRIF uses terms not defined in
 the standard, their definitions may be found in the [`Glossary`](#glossary).
 
-# PRIF Types and Constants
+# PRIF Types and Named Constants
 
 ## Fortran Intrinsic Derived Types
 
@@ -241,6 +364,10 @@ types in the compiler's implementation of the `ISO_FORTRAN_ENV` module. This
 enables the internal structure of each given type to be tailored as needed for
 a given PRIF implementation.
 
+| **CLIENT NOTE:** |
+| ---------------- |
+| The components comprising the PRIF definitions of the Fortran Intrinsic Derived types are deliberately unspecified by PRIF, and to ensure portability the compiler should not hard-code reliance on those details. However note that at compile-time the detailed representation corresponding to a given PRIF implementation will be visible to the compiler in the interface declarations of the `prif` module. |
+
 ### `prif_team_type`
 
 * implementation for `TEAM_TYPE` from `ISO_FORTRAN_ENV`
@@ -257,9 +384,31 @@ a given PRIF implementation.
 
 * implementation for `NOTIFY_TYPE` from `ISO_FORTRAN_ENV`
 
-## Constants in `ISO_FORTRAN_ENV`
+## PRIF-Specific Types
+
+These derived types are defined by the PRIF implementation in the `prif`
+module. They don't correspond directly to types mandated
+by the Fortran specification, but rather are helper types used in PRIF to
+provide the parallel Fortran features.
+
+| **CLIENT NOTE:** |
+| ---------------- |
+| The components comprising the PRIF-Specific types are deliberately unspecified by PRIF, and to ensure portability the compiler should not hard-code reliance on those details. However note that at compile-time the detailed representation corresponding to a given PRIF implementation will be visible to the compiler in the interface declarations of the `prif` module. |
+
+### `prif_coarray_handle`
+
+* a derived type provided by the PRIF implementation.
+  It represents a reference to a coarray descriptor and is passed 
+  back and forth across PRIF for coarray operations. 
+
+### `prif_critical_type`
+
+* a derived type provided by the PRIF implementation that is
+  used for implementing `critical` blocks
 
-These values will be defined in the PRIF implementation and it is proposed that the
+## Named Constants in `ISO_FORTRAN_ENV`
+
+These named constants will be defined in the PRIF implementation and it is proposed that the
 compiler will use a rename to use the PRIF implementation definitions for these
 values in the compiler's implementation of the `ISO_FORTRAN_ENV` module.
 
@@ -295,80 +444,72 @@ implementation. It shall be distinct from the values `PRIF_CURRENT_TEAM` and
 
 This shall be a value of type `integer(c_int)` that is defined by the
 implementation to be negative if the implementation cannot detect failed images
-and positive otherwise. It shall be distinct from all other stat constants
+and positive otherwise. It shall be distinct from all other stat named constants
 defined by this specification.
 
 ### `PRIF_STAT_LOCKED`
 
 This shall be a value of type `integer(c_int)` that is defined by the
-implementation. It shall be distinct from all other stat constants
+implementation. It shall be distinct from all other stat named constants
 defined by this specification.
 
 ### `PRIF_STAT_LOCKED_OTHER_IMAGE`
 
 This shall be a value of type `integer(c_int)` that is defined by the
-implementation. It shall be distinct from all other stat constants
+implementation. It shall be distinct from all other stat named constants
 defined by this specification.
 
 ### `PRIF_STAT_STOPPED_IMAGE`
 
 This shall be a positive value of type `integer(c_int)` that is defined by the
-implementation. It shall be distinct from all other stat constants
+implementation. It shall be distinct from all other stat named constants
 defined by this specification.
 
 ### `PRIF_STAT_UNLOCKED`
 
 This shall be a value of type `integer(c_int)` that is defined by the
-implementation. It shall be distinct from all other stat constants
+implementation. It shall be distinct from all other stat named constants
 defined by this specification.
 
 ### `PRIF_STAT_UNLOCKED_FAILED_IMAGE`
 
 This shall be a value of type `integer(c_int)` that is defined by the
-implementation. It shall be distinct from all other stat constants
+implementation. It shall be distinct from all other stat named constants
 defined by this specification.
 
-## PRIF-Specific Constants
+## PRIF-Specific Named Constants
 
-This constant is not defined by the Fortran standard.
+These named constants have no directly corresponding constants specified in the Fortran standard.
 
 ### `PRIF_STAT_OUT_OF_MEMORY`
 
 This shall be a value of type `integer(c_int)` that is defined by the
-implementation. It shall be distinct from  all other stat constants
+implementation. It shall be distinct from all other stat named constants
 defined by this specification. It shall indicate a low-memory condition
 and may be returned by `prif_allocate_coarray` or `prif_allocate`.
 
-## PRIF-Specific Types
+### `PRIF_STAT_ALREADY_INIT`
 
-These derived types are defined by the PRIF implementation and the contents are
-opaque to the compiler. They don't correspond directly to types mandated
-by the Fortran specification, but rather are helper types used in PRIF to 
-provide the parallel Fortran features.
+This shall be a value of type `integer(c_int)` that is defined by the
+implementation. It shall be distinct from all other stat named constants
+defined by this specification. It shall indicate that `prif_init`
+has previously been called.
 
-### `prif_coarray_handle`
+### `PRIF_VERSION_MAJOR`
 
-* a derived type provided by the PRIF implementation whose contents are opaque to the
-  compiler. It represents a reference to a coarray descriptor and is passed 
-  back and forth across PRIF for coarray operations. 
-* Each coarray descriptor maintains some "context data" on a per-image basis, which the compiler may
-  use to support proper implementation of coarray arguments, especially with
-  respect to `MOVE_ALLOC` operations on allocatable coarrays.
-  This is accessed/set with the procedures `prif_get_context_handle` and
-  `prif_set_context_handle`. PRIF does not interpret the contents of this context data in
-  any way, and it is only accessible on the current image. The context data is
-  a property of the allocated coarray object, and is thus shared between all
-  handles and aliases that refer to the same coarray allocation (i.e. those
-  created from a call to `prif_alias_create`).
+This shall be a named constant of type `integer(c_int)` that is defined by the
+implementation and represents the major revision number of the PRIF specification
+(i.e. this document) that the implementation supports.
 
-### `prif_critical_type`
+### `PRIF_VERSION_MINOR`
 
-* a derived type provided by the PRIF implementation that is opaque to the
-  compiler and is used for implementing `critical` blocks
+This shall be a named constant of type `integer(c_int)` that is defined by the
+implementation and represents the minor revision number of the PRIF specification
+(i.e. this document) that the implementation supports.
 
 # PRIF Procedures
 
-**The PRIF API provides implementations of parallel Fortran features, as specified
+**PRIF provides implementations of parallel Fortran features, as specified
 in Fortran 2023. For any given `prif_*` procedure that corresponds to a Fortran
 procedure or statement of similar name, the constraints and semantics associated
 with each argument to the `prif_*` procedure match those of the analogous
@@ -378,25 +519,47 @@ procedure or statement of similar name, the constraints and semantics match thos
 of the analogous parallel Fortran feature. In particular, any required synchronization
 is performed by the PRIF implementation unless otherwise specified.**
 
+This section specifies PRIF subroutine declarations, formatted as in this example:
+
+```
+subroutine prif_stop(...)
+  logical(c_bool), intent(in) :: quiet
+  integer(c_int), intent(in), optional :: stop_code_int
+  character(len=*), intent(in), optional :: stop_code_char
+end subroutine
+```
+
+Unless otherwise noted, each such subroutine declaration appearing in this document 
+specifies a public `module subroutine` interface declaration that shall be provided by a 
+compliant PRIF implementation in the `prif` Fortran module, along with an implementation.
+As shown in the first line of the declaration above, 
+the *dummy-arg-list* is elided using `...` as a presentational short-hand. 
+Subroutine dummy arguments are specified in-order on subsequent lines, and
+compliant module subroutines shall accept dummy arguments using those same names and ordering.
+
+Where `optional` dummy arguments would be allowed to appear in the corresponding parallel
+Fortran procedure, `optional` dummy arguments are used for the equivalent PRIF procedure. 
+For most cases where a parallel feature provides different overloads with different lists
+of valid arguments, distinct corresponding procedure variants are specified in PRIF.
+
 | **IMPLEMENTATION NOTE**: |
 | ---------------- |
-| The PRIF API is defined as a set of Fortran language procedures and supporting types, and as such an implementation of PRIF cannot be expressed solely in C/C++. However C/C++ can be used to implement portions of the PRIF procedures via calls to BIND(C) procedures. |
+| PRIF is defined as a set of Fortran procedures, types and named constants, and as such an implementation of PRIF cannot be expressed solely in C/C++. However C/C++ can be used to implement internal portions of PRIF procedures via calls to `BIND(C)` procedures. |
 
-Where possible, optional arguments are used for optional parts or different
-forms of statements or procedures. In some cases the different forms or presence
-of certain options change the return type or rank, and in those cases a generic
-interface with different specific procedures is used.
+| **CLIENT NOTE:** |
+| ---------------- |
+| PRIF procedures, types and named constants are defined as Fortran entities, without the `BIND(C)` attribute, and thus clients should use them as such. |
 
 ## Common Arguments
 
-There are multiple Common Arguments sections throughout the specification that
+There are multiple Common Arguments sections throughout this specification that
 outline details of the arguments that are common for the following sections
 of procedure interfaces.
 
 ### Integer and Pointer Arguments
 
 There are several categories of arguments where the PRIF implementation will need
-pointers and/or integers. These fall broadly into the following categories.
+pointers and/or integers. These fall broadly into the following categories:
 
 1. `integer(c_intptr_t)`: Anything containing a pointer representation where
    the compiler might be expected to perform pointer arithmetic
@@ -420,29 +583,14 @@ The compiler is responsible for generating values and temporary variables as
 necessary to pass arguments of the correct type/size, and perform conversions
 when needed.
 
-### Common Arguments
-
-* **`team`**
-  * a value of type `prif_team_type` that identifies a team that the
-    current image is a member of
-  * shall not be present with `team_number` except in a call to `prif_form_team`
-* **`team_number`**
-  * a value of type `integer(c_intmax_t)` that identifies a sibling team or,
-    in a call to `prif_form_team`, which team to join
-  * shall not be present with `team` except in a call to `prif_form_team`
-* **`image_num`**
-  * an argument identifying the image to be communicated with
-  * is permitted to identify the current image
-  * the image index is always relative to the initial team, unless otherwise specified
-
 ### `stat` and `errmsg` Arguments
 
 * **`stat`** : This argument is `intent(out)` and represents the presence and
   type of any error that occurs. A value of zero indicates no error occurred.
   It is of type `integer(c_int)`, to minimize the frequency that integer
-  conversions will be needed. If a different kind of integer is used as the
+  conversions will be needed. If the user program provides a different kind of integer as the
   argument, it is the compiler's responsibility to use an intermediate variable
-  as the argument to the PRIF implementation procedure and provide conversion to the
+  as the argument to the PRIF procedure and provide conversion to the
   actual argument.
 * **`errmsg` or `errmsg_alloc`** : There are two optional `intent(out)` arguments for this,
   one which is allocatable and one which is not. It is the compiler's
@@ -455,7 +603,11 @@ when needed.
 For a program that uses parallel Fortran features, the compiler shall insert
 calls to `prif_init` and `prif_stop`. These procedures will initialize and
 terminate the parallel runtime. `prif_init` shall be called prior
-to any other calls to the PRIF implementation. `prif_stop` shall be called
+to any other calls to the PRIF implementation and shall be called at least
+once per process. Any second or subsequent call to `prif_init` by a given process
+is guaranteed to return immediately with no effect on system state,
+with `PRIF_STAT_ALREADY_INIT` assigned to the variable specified in the `stat` argument. 
+`prif_stop` shall be called
 to initiate normal termination if the program reaches normal termination
 at the end of the main program.
 
@@ -464,14 +616,16 @@ at the end of the main program.
 **Description**: This procedure will initialize the parallel environment.
     
 ```
-subroutine prif_init(stat)
+subroutine prif_init(...)
   integer(c_int), intent(out) :: stat
 end subroutine
 ```
 **Further argument descriptions**:
 
-* **`stat`**: a non-zero value indicates an error occurred during
-  initialization.
+* **`stat`**: a zero value indicates success, the named constant
+  `PRIF_STAT_ALREADY_INIT` indicates previous initialization and
+  any other non-zero value indicates an error occurred during
+  initialization
 
 ### `prif_stop`
 
@@ -482,7 +636,7 @@ end subroutine
   the user source code.
     
 ```
-subroutine prif_stop(quiet, stop_code_int, stop_code_char)
+subroutine prif_stop(...)
   logical(c_bool), intent(in) :: quiet
   integer(c_int), intent(in), optional :: stop_code_int
   character(len=*), intent(in), optional :: stop_code_char
@@ -507,7 +661,7 @@ end subroutine
   Calls to this procedure do not return.
     
 ```
-subroutine prif_error_stop(quiet, stop_code_int, stop_code_char)
+subroutine prif_error_stop(...)
   logical(c_bool), intent(in) :: quiet
   integer(c_int), intent(in), optional :: stop_code_int
   character(len=*), intent(in), optional :: stop_code_char
@@ -539,21 +693,37 @@ end subroutine
 
 ## Image Queries
 
+
+### Common Arguments in Image Queries
+
+* **`team`**: a value of type `prif_team_type` that identifies a current or
+  ancestor team containing the current image.  When the `team` argument has the
+  `optional` attribute and is absent, the team specified is the current team.
+
 ### `prif_num_images`
 
 **Description**: Query the number of images in the specified or current team.
     
 ```
-subroutine prif_num_images(team, team_number, image_count)
-  type(prif_team_type), intent(in), optional :: team
-  integer(c_intmax_t), intent(in), optional :: team_number
-  integer(c_int), intent(out) :: image_count
+subroutine prif_num_images(...)
+  integer(c_int), intent(out) :: num_images
+end subroutine
+
+subroutine prif_num_images_with_team(...)
+  type(prif_team_type), intent(in) :: team
+  integer(c_int), intent(out) :: num_images
+end subroutine
+
+subroutine prif_num_images_with_team_number(...)
+  integer(c_intmax_t), intent(in) :: team_number
+  integer(c_int), intent(out) :: num_images
 end subroutine
 ```
+[Argument descriptions](#common-arguments-in-image-queries)
+
 **Further argument descriptions**:
 
-* **`team` and `team_number`**: optional arguments that specify a team. They
-  shall not both be present in the same call.
+* **`team_number`**: identifies the initial team or a sibling team of the current team
 
 ### `prif_this_image`
 
@@ -561,31 +731,29 @@ end subroutine
   given coarray of the current image in a given team or the current team.
     
 ```
-interface prif_this_image
-  subroutine prif_this_image_no_coarray(team, image_index)
-    type(prif_team_type), intent(in), optional :: team
-    integer(c_int), intent(out) :: image_index
-  end subroutine
+subroutine prif_this_image_no_coarray(...)
+  type(prif_team_type), intent(in), optional :: team
+  integer(c_int), intent(out) :: this_image
+end subroutine
 
-  subroutine prif_this_image_with_coarray( &
-      coarray_handle, team, cosubscripts)
-    type(prif_coarray_handle), intent(in) :: coarray_handle
-    type(prif_team_type), intent(in), optional :: team
-    integer(c_intmax_t), intent(out) :: cosubscripts(:)
-  end subroutine
+subroutine prif_this_image_with_coarray(...)
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  type(prif_team_type), intent(in), optional :: team
+  integer(c_intmax_t), intent(out) :: cosubscripts(:)
+end subroutine
 
-  subroutine prif_this_image_with_dim( &
-      coarray_handle, dim, team, cosubscript)
-    type(prif_coarray_handle), intent(in) :: coarray_handle
-    integer(c_int), intent(in) :: dim
-    type(prif_team_type), intent(in), optional :: team
-    integer(c_intmax_t), intent(out) :: cosubscript
-  end subroutine
-end interface
+subroutine prif_this_image_with_dim(...)
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_int), intent(in) :: dim
+  type(prif_team_type), intent(in), optional :: team
+  integer(c_intmax_t), intent(out) :: cosubscript
+end subroutine
 ```
+[Argument descriptions](#common-arguments-in-image-queries)
+
 **Further argument descriptions**:
 
-* **`coarray_handle`**: is described in the Common Arguments section under [`Storage Management`](#storage-management)
+* **`coarray_handle`**: a handle for the descriptor of an established coarray
 * **`cosubscripts`**: the cosubscripts that would identify the current image
   in the specified team when used as cosubscripts for the specified coarray
 * **`dim`**: identify which of the elements from `cosubscripts` should be
@@ -597,71 +765,58 @@ end interface
 ### `prif_failed_images`
 
 **Description**: Determine the image indices of any images known to have failed.
+  It is the compiler's responsibility to convert to a
+  different kind if the `kind` argument to `FAILED_IMAGES` appears.
     
 ```
-subroutine prif_failed_images(team, failed_images)
+subroutine prif_failed_images(...)
   type(prif_team_type), intent(in), optional :: team
   integer(c_int), allocatable, intent(out) :: failed_images(:)
 end subroutine
 ```
+[Argument descriptions](#common-arguments-in-image-queries)
 
 ### `prif_stopped_images`
 
 **Description**: Determine the image indices of any images known to have initiated
   normal termination.
+  It is the compiler's responsibility to convert to a
+  different kind if the `kind` argument to `STOPPED_IMAGES` appears.
     
 ```
-subroutine prif_stopped_images(team, stopped_images)
+subroutine prif_stopped_images(...)
   type(prif_team_type), intent(in), optional :: team
   integer(c_int), allocatable, intent(out) :: stopped_images(:)
 end subroutine
 ```
+[Argument descriptions](#common-arguments-in-image-queries)
 
 ### `prif_image_status`
 
 **Description**: Determine the image execution state of an image
     
 ```
-impure elemental subroutine prif_image_status(image, team, image_status)
+subroutine prif_image_status(...)
   integer(c_int), intent(in) :: image
   type(prif_team_type), intent(in), optional :: team
   integer(c_int), intent(out) :: image_status
 end subroutine
 ```
+[Argument descriptions](#common-arguments-in-image-queries)
+
 **Further argument descriptions**:
 
 * **`image`**: the image index of the image in the given or current team for
   which to return the execution status
-* **`team`**: if provided, the team from which to identify the image
 * **`image_status`**: defined to the value `PRIF_STAT_FAILED_IMAGE` if the identified
     image has failed, `PRIF_STAT_STOPPED_IMAGE` if the identified image has initiated
     normal termination, otherwise zero.
 
 ## Storage Management
 
-### Common Arguments
-
-* **`coarray_handle`**
-  * Argument for many of the coarray access procedures
-  * scalar of type [`prif_coarray_handle`](#prif_coarray_handle)
-  * is a handle for the descriptor of an established coarray
-* **`cosubscripts`**
-  * Argument for many of the coarray access procedures
-  * 1d assumed-shape array of type `integer(c_intmax_t)`
-  * correspond to the cosubscripts appearing in a _coindexed-named-object_ reference
-* **`value`** or `current_image_buffer`
-  * Argument for `put` and `get` operations
-  * assumed-rank array of `type(*)` or `type(c_ptr)`
-  * It is the value to be sent in a `put` operation, and is assigned the value
-    retrieved in the case of a `get` operation
-* **`image_num`**
-  * an argument identifying the image to be communicated with
-  * is permitted to identify the current image
-  * the image index is always relative to the initial team, unless otherwise specified
-
 ### `prif_allocate_coarray`
 
-**Description**: This procedure allocates memory for a coarray. 
+**Description**: This procedure allocates memory for a coarray and provides a corresponding descriptor. 
   This call is collective over the current team.  Calls to
   `prif_allocate_coarray` will be inserted by the compiler when there is an explicit
   coarray allocation or at the beginning of a program to allocate space for
@@ -670,13 +825,10 @@ end subroutine
   lifetime of the coarray.
     
 ```
-subroutine prif_allocate_coarray( &
-    lcobounds, ucobounds, lbounds, ubounds, element_length, &
-    final_func, coarray_handle, allocated_memory, &
-    stat, errmsg, errmsg_alloc)
-  integer(kind=c_intmax_t), intent(in) :: lcobounds(:), ucobounds(:)
-  integer(kind=c_intmax_t), intent(in) :: lbounds(:), ubounds(:)
-  integer(kind=c_size_t), intent(in) :: element_length
+subroutine prif_allocate_coarray(...)
+  integer(c_intmax_t), intent(in) :: lcobounds(:), ucobounds(:)
+  integer(c_intmax_t), intent(in) :: lbounds(:), ubounds(:)
+  integer(c_size_t), intent(in) :: element_size
   type(c_funptr), intent(in) :: final_func
   type(prif_coarray_handle), intent(out) :: coarray_handle
   type(c_ptr), intent(out) :: allocated_memory
@@ -687,15 +839,15 @@ end subroutine
 ```
 **Further argument descriptions**:
 
-* **`lcobounds` and `ucobounds`**: Shall be the lower and upper bounds of the
+* **`lcobounds`** and **`ucobounds`**: Shall be the lower and upper bounds of the
   codimensions of the coarray being allocated. Shall be 1d arrays with the
   same dimensions as each other. The cobounds shall be sufficient to have a
   unique index for every image in the current team.
   I.e. `product(ucobounds - lcobounds + 1) >= num_images()`.
-* **`lbounds` and `ubounds`**: Shall be the the lower and upper bounds of the
+* **`lbounds`** and **`ubounds`**: Shall be the the lower and upper bounds of the
   current image's portion of the array. Shall be 1d arrays with the same dimensions as
   each other.
-* **`element_length`**: size of a single element of the array in bytes
+* **`element_size`**: size of a single element of the array in bytes
 * **`final_func`**: Shall be the C address of a procedure that is interoperable, or
   `C_NULL_FUNPTR`. If not null, this procedure will be invoked by the PRIF implementation
   once by each image at deallocation of this coarray, before the storage is released.
@@ -707,21 +859,19 @@ end subroutine
     character(len=:), intent(out), allocatable :: errmsg
   end subroutine
   ```
-  or to the following equivalent C prototype
+  or to the following equivalent C prototype:
   ```
   void coarray_cleanup( 
       CFI_cdesc_t* handle, int* stat, CFI_cdesc_t* errmsg)
   ```
 * **`coarray_handle`**: Represents the distributed object of the coarray on
   the corresponding team. The handle is created by the PRIF implementation and the
-  compiler uses it for subsequent _coindexed-named-object_ references of the
+  compiler uses it for subsequent coindexed object references of the
   associated coarray and for deallocation of the associated coarray.
 * **`allocated_memory`**: A pointer to the block of allocated but uninitialized memory
   that provides the storage for the current image's coarray. The compiler is responsible
   for associating the Fortran-level coarray object with this storage, and initializing
   the storage if necessary. The returned pointer value may differ across images in the team.
-  `prif_base_pointer` should be used to locate corresponding coarrays on
-  other images.
 
 | **CLIENT NOTE**: |
 | ---------------- |
@@ -734,9 +884,8 @@ The coarray handle can be interrogated by the procedure callback using PRIF quer
   such as needed for an allocatable component of a coarray.
     
 ```
-subroutine prif_allocate( &
-    size_in_bytes, allocated_memory, stat, errmsg, errmsg_alloc)
-  integer(kind=c_size_t) :: size_in_bytes
+subroutine prif_allocate(...)
+  integer(c_size_t) :: size_in_bytes
   type(c_ptr), intent(out) :: allocated_memory
   integer(c_int), intent(out), optional :: stat
   character(len=*), intent(inout), optional :: errmsg
@@ -767,9 +916,8 @@ end subroutine
   completed.
     
 ```
-subroutine prif_deallocate_coarray( &
-    coarray_handles, stat, errmsg, errmsg_alloc)
-  type(prif_coarray_handle), target, intent(in) :: coarray_handles(:)
+subroutine prif_deallocate_coarray(...)
+  type(prif_coarray_handle), intent(in) :: coarray_handles(:)
   integer(c_int), intent(out), optional :: stat
   character(len=*), intent(inout), optional :: errmsg
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
@@ -778,9 +926,7 @@ end subroutine
 **Further argument descriptions**:
 
 * **`coarray_handles`**: Is an array of all of the handles for the coarrays
-  that shall be deallocated. Note that the target attribute is not required
-  for the actual argument to this procedure. It is only to allow the
-  implementation to call the `final_func` procedures with each handle.
+  that shall be deallocated. 
 
 ### `prif_deallocate`
 
@@ -788,8 +934,7 @@ end subroutine
   to `prif_allocate`.
     
 ```
-subroutine prif_deallocate( &
-    mem, stat, errmsg, errmsg_alloc)
+subroutine prif_deallocate(...)
   type(c_ptr), intent(in) :: mem
   integer(c_int), intent(out), optional :: stat
   character(len=*), intent(inout), optional :: errmsg
@@ -810,13 +955,14 @@ end subroutine
 
 ### `prif_alias_create`
 
-**Description**: Create a new coarray handle for an existing coarray, such as part of `CHANGE TEAM`
+**Description**: Create a new coarray descriptor aliased to an existing coarray, 
+  with possibly altered corank and cobounds. This may be needed as part of `CHANGE TEAM`
   after [`prif_change_team`](#prif_change_team), or to pass to a coarray dummy
-  argument (especially in the case that the cobounds are different)
+  argument (especially in the case that the cobounds are different). 
+  This call does not alter data in the coarray.
     
 ```
-subroutine prif_alias_create( &
-    source_handle, alias_lcobounds, alias_ucobounds, alias_handle)
+subroutine prif_alias_create(...)
   type(prif_coarray_handle), intent(in) :: source_handle
   integer(c_intmax_t), intent(in) :: alias_lcobounds(:)
   integer(c_intmax_t), intent(in) :: alias_ucobounds(:)
@@ -825,25 +971,25 @@ end subroutine
 ```
 **Further argument descriptions**:
 
-* **`source_handle`**: a handle (which may itself be an alias) to the existing
-  coarray for which an alias is to be created
-* **`alias_lcobounds` and `alias_ucobounds`**: the cobounds to be used for
+* **`source_handle`**: a handle to an existing coarray descriptor (which may itself be an alias) 
+  for which a new alias descriptor is to be created. The original descriptor is not modified.
+* **`alias_lcobounds`** and **`alias_ucobounds`**: the cobounds to be used for
   the new alias. Both arguments must have the same size, but it need not
   match the corank associated with `source_handle`
-* **`alias_handle`**: a new alias to the existing coarray
+* **`alias_handle`**: a handle to a new coarray descriptor that aliases the data in an existing coarray
 
 ### `prif_alias_destroy`
 
-**Description**: Delete an alias to a coarray. Does not deallocate the original coarray.
+**Description**: Delete an alias descriptor for a coarray. Does not deallocate or alter the original coarray.
     
 ```
-subroutine prif_alias_destroy(alias_handle)
+subroutine prif_alias_destroy(...)
   type(prif_coarray_handle), intent(in) :: alias_handle
 end subroutine
 ```
 **Further argument descriptions**:
 
-* **`alias_handle`**: the alias to be destroyed
+* **`alias_handle`**: handle to the alias descriptor to be destroyed
 
 ### `MOVE_ALLOC`
 
@@ -860,6 +1006,20 @@ requires synchronization, so the compiler should likely insert call(s) to
 
 ## Coarray Queries
 
+### Common Arguments in Coarray Queries
+
+* **`coarray_handle`**: a handle for a descriptor of an established coarray
+
+Each coarray includes some "context data" on a per-image basis, which the compiler may
+use to support proper implementation of coarray arguments, especially with
+respect to `MOVE_ALLOC` operations on allocatable coarrays.
+This data is accessed using the procedures `prif_get_context_data` and
+`prif_set_context_data`. PRIF does not interpret the contents of this context data in
+any way, and it is only accessible on the current image. The context data is
+a property of the allocated coarray object, and is thus shared between all
+handles and aliased descriptors that refer to the same coarray allocation (i.e. those
+created from a call to `prif_alias_create`).
+
 ### `prif_set_context_data`
 
 **Description**: This procedure stores a `c_ptr` associated with a coarray
@@ -868,67 +1028,41 @@ requires synchronization, so the compiler should likely insert call(s) to
   that the coarray is deallocated.
     
 ```
-subroutine prif_set_context_data(coarray_handle, context_data)
+subroutine prif_set_context_data(...)
   type(prif_coarray_handle), intent(in) :: coarray_handle
   type(c_ptr), intent(in) :: context_data
 end subroutine
 ```
+[Argument descriptions](#common-arguments-in-coarray-queries)
 
 ### `prif_get_context_data`
 
 **Description**: This procedure returns the `c_ptr` provided in the most
   recent call to [`prif_set_context_data`](#prif_set_context_data) with the
-  same coarray (possibly via an alias coarray handle).
+  same coarray (possibly via an aliased coarray descriptor).
     
 ```
-subroutine prif_get_context_data(coarray_handle, context_data)
+subroutine prif_get_context_data(...)
   type(prif_coarray_handle), intent(in) :: coarray_handle
   type(c_ptr), intent(out) :: context_data
 end subroutine
 ```
-
-### `prif_base_pointer`
-
-**Description**: This procedure returns a C pointer value referencing the base of the
-  corresponding coarray elements on a given image and may be used in conjunction with
-  various communication operations. Pointer arithmetic operations may be
-  performed with the value and the results provided as input to the
-  `get/put_*raw` or atomic procedures (none of which are guaranteed to perform
-  validity checks, e.g., to detect out-of-bounds access violations).
-  It is not valid to dereference the produced pointer value
-  or the result of any operations performed with it on any image except for
-  the identified image. If the `image_num` argument is zero, then `coarray_handle` is ignored
-  and `ptr` becomes defined with the value zero. It is an error to pass
-  a number less than `0` or greater than the number of images to the `image_num` argument,
-  in which case `ptr` becomes undefined.
-    
-```
-subroutine prif_base_pointer(coarray_handle, image_num, ptr)
-  type(prif_coarray_handle), intent(in) :: coarray_handle
-  integer(c_int), intent(in) :: image_num
-  integer(c_intptr_t), intent(out) :: ptr
-end subroutine
-```
-**Further argument descriptions**:
-
-* **`image_num`**: identifies the image number in the initial team on which
-  the address is being requested
-* **`ptr`**: returns a pointer to the beginning of the data elements
-  for the corresponding coarray on the identified image 
+[Argument descriptions](#common-arguments-in-coarray-queries)
 
 ### `prif_size_bytes`
 
 **Description**: This procedure returns the size of the coarray element data associated
-  with the current image. This will be equal to the following expression of the
+  with each image. This will be equal to the following expression of the
   arguments provided to [`prif_allocate_coarray`](#prif_allocate_coarray) at the time that the
-  coarray was allocated; `element_length * product(ubounds-lbounds+1)`
+  coarray was allocated; `element_size * product(ubounds-lbounds+1)`
     
 ```
-subroutine prif_size_bytes(coarray_handle, data_size)
+subroutine prif_size_bytes(...)
   type(prif_coarray_handle), intent(in) :: coarray_handle
   integer(c_size_t), intent(out) :: data_size
 end subroutine
 ```
+[Argument descriptions](#common-arguments-in-coarray-queries)
 
 | **CLIENT NOTE**: |
 | ---------------- |
@@ -936,69 +1070,75 @@ end subroutine
 
 ### `prif_lcobound`
 
-**Description**: returns the lower cobound(s) associated with a coarray handle.
+**Description**: returns the lower cobound(s) associated with a coarray descriptor.
   It is the compiler's responsibility to convert to a
   different kind if the `kind` argument to `LCOBOUND` appears.
     
 ```
-interface prif_lcobound
-  subroutine prif_lcobound_with_dim(coarray_handle, dim, lcobound)
-    type(prif_coarray_handle), intent(in) :: coarray_handle
-    integer(c_int), intent(in) :: dim
-    integer(c_intmax_t), intent(out):: lcobound
-  end subroutine
-  subroutine prif_lcobound_no_dim(coarray_handle, lcobounds)
-    type(prif_coarray_handle), intent(in) :: coarray_handle
-    integer(c_intmax_t), intent(out) :: lcobounds(:)
-  end subroutine
-end interface
+subroutine prif_lcobound_with_dim(...)
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_int), intent(in) :: dim
+  integer(c_intmax_t), intent(out):: lcobound
+end subroutine
+
+subroutine prif_lcobound_no_dim(...)
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_intmax_t), intent(out) :: lcobounds(:)
+end subroutine
 ```
+[Argument descriptions](#common-arguments-in-coarray-queries)
+
 **Further argument descriptions**:
 
-* **`dim`**: which codimension of the coarray to report the lower cobound of
+* **`dim`**: which codimension of the coarray descriptor to report the lower cobound of
 * **`lcobound`**: the lower cobound of the given dimension
-* **`lcobounds`**: an array of the size of the corank of the coarray handle, returns
-  the lower cobounds of the given coarray handle
+* **`lcobounds`**: an array of the size of the corank of the coarray descriptor, returns
+  the lower cobounds of the given coarray descriptor
 
 ### `prif_ucobound`
 
-**Description**: returns the upper cobound(s) associated with a coarray handle.
+**Description**: returns the upper cobound(s) associated with a coarray descriptor.
   It is the compiler's responsibility to convert to a
   different kind if the `kind` argument to `UCOBOUND` appears.
     
 ```
-interface prif_ucobound
-  subroutine prif_ucobound_with_dim(coarray_handle, dim, ucobound)
-    type(prif_coarray_handle), intent(in) :: coarray_handle
-    integer(c_int), intent(in) :: dim
-    integer(c_intmax_t), intent(out):: ucobound
-  end subroutine
-  subroutine prif_ucobound_no_dim(coarray_handle, ucobounds)
-    type(prif_coarray_handle), intent(in) :: coarray_handle
-    integer(c_intmax_t), intent(out) :: ucobounds(:)
-  end subroutine
-end interface
+subroutine prif_ucobound_with_dim(...)
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_int), intent(in) :: dim
+  integer(c_intmax_t), intent(out):: ucobound
+end subroutine
+
+subroutine prif_ucobound_no_dim(...)
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_intmax_t), intent(out) :: ucobounds(:)
+end subroutine
 ```
+[Argument descriptions](#common-arguments-in-coarray-queries)
+
 **Further argument descriptions**:
 
-* **`dim`**: which codimension of the coarray to report the upper cobound of
+* **`dim`**: which codimension of the coarray descriptor to report the upper cobound of
 * **`ucobound`**: the upper cobound of the given dimension
-* **`ucobounds`**: an array of the size of the corank of the coarray handle, returns
-    the upper cobounds of the given coarray handle
+* **`ucobounds`**: an array of the size of the corank of the coarray descriptor, returns
+    the upper cobounds of the given coarray descriptor
 
 ### `prif_coshape`
 
-**Description**: returns the sizes of codimensions of a coarray
+**Description**: returns the sizes of codimensions of a coarray descriptor.
+  It is the compiler's responsibility to convert to a
+  different kind if the `kind` argument to `COSHAPE` appears.
     
 ```
-subroutine prif_coshape(coarray_handle, sizes)
+subroutine prif_coshape(...)
   type(prif_coarray_handle), intent(in) :: coarray_handle
   integer(c_size_t), intent(out) :: sizes(:)
 end subroutine
 ```
+[Argument descriptions](#common-arguments-in-coarray-queries)
+
 **Further argument descriptions**:
 
-* **`sizes`**: an array of the size of the corank of the coarray handle, returns the
+* **`sizes`**: an array of the size of the corank of the coarray descriptor, returns the
     difference between the upper and lower cobounds + 1
 
 ### `prif_image_index`
@@ -1008,24 +1148,36 @@ end subroutine
   in the `sub` argument with the given coarray handle
     
 ```
-subroutine prif_image_index( &
-    coarray_handle, sub, team, team_number, image_index)
+subroutine prif_image_index(...)
   type(prif_coarray_handle), intent(in) :: coarray_handle
   integer(c_intmax_t), intent(in) :: sub(:)
-  type(prif_team_type), intent(in), optional :: team
-  integer(c_int), intent(in), optional :: team_number
+  integer(c_int), intent(out) :: image_index
+end subroutine
+
+subroutine prif_image_index_with_team(...)
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_intmax_t), intent(in) :: sub(:)
+  type(prif_team_type), intent(in) :: team
+  integer(c_int), intent(out) :: image_index
+end subroutine
+
+subroutine prif_image_index_with_team_number(...)
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_intmax_t), intent(in) :: sub(:)
+  integer(c_int), intent(in) :: team_number
   integer(c_int), intent(out) :: image_index
 end subroutine
 ```
+[Argument descriptions](#common-arguments-in-coarray-queries)
+
 **Further argument descriptions**:
 
-* **`team` and `team_number`**: optional arguments that specify a team. They
-  shall not both be present in the same call.
+* **`team`** and **`team_number`**: Specifies a team
 * **`sub`**: A list of integers that identify a specific image in the
-  identified or current team when interpreted as cosubscripts for the provided
-  coarray handle.
+  identified or current team when interpreted as cosubscripts for the specified
+  coarray descriptor.
 
-## Coarray Access
+## Contiguous Coarray Access
 
 The memory consistency semantics of coarray accesses follow those defined
 by the Image Execution Control section of the Fortran standard. In particular,
@@ -1035,271 +1187,501 @@ segments. Note that for put operations, "source completion" means that the provi
 source locations are no longer needed (e.g. their memory can be freed once the procedure
 has returned). 
 
-### Common Arguments
+### Common Arguments in Contiguous Coarray Access
+
+* **`image_num`**
+  * an argument identifying the image to be communicated with
+  * is permitted to identify the current image
+  * this image index is always relative to the initial team, regardless of the current team
+
+* **`coarray_handle`**: a handle for the descriptor of an established coarray to be accessed by this operation. 
+`offset` and `size_in_bytes` must specify a range of storage entirely contained within the elements of the coarray referred to by the handle.
+
+* **`offset`**: indicates an offset in bytes from the beginning of the elements in a remote coarray (indicated by `coarray_handle`) on a selected image (indicated by `image_num`)
+
+* **`remote_ptr`**: pointer to where on the identified image the data begins.
+  The referenced storage must have been allocated using `prif_allocate` or `prif_allocate_coarray`.
+
+* **`current_image_buffer`**: pointer to contiguous memory on the calling image that either
+  contains the source data to be copied (puts) or is the destination memory
+  for the data to be retrieved (gets).
+
+* **`size_in_bytes`**: how much data is to be transferred in bytes
 
 * **`notify_ptr`**: pointer on the identified image to the notify
   variable that should be updated on completion of the put operation. The
   referenced variable shall be of type `prif_notify_type`, and the storage
-  must have been allocated using `prif_allocate_coarray` or `prif_allocate`.
-  If this optional argument is omitted, then no notification is performed.
+  must have been allocated using `prif_allocate` or `prif_allocate_coarray`.
 
-* **`remote_ptr`**: pointer to where on the identified image the data begins.
-  The referenced storage must have been allocated using `prif_allocate_coarray` or `prif_allocate`.
+* **`notify_coarray_handle`, `notify_offset`**: a coarray handle and byte offset
+  that identifies the location of a `prif_notify_type` variable to be updated
+  on completion of the put operation. That variable must be entirely contained
+  within the elements of the coarray referenced by `notify_coarray_handle`
 
-### `prif_put`
+### `prif_get`
 
-**Description**: This procedure assigns to the elements of a coarray, when the elements to be
-  assigned are contiguous in linear memory on both sides. 
-  The compiler can use this to implement assignment to a _coindexed-named-object_. 
-  It need not call this procedure when the coarray reference is not a _coindexed-named-object_. 
-  This procedure blocks on source completion. This procedure corresponds to a contiguous coarray
-  reference on the left hand side of an _assignment-stmt_.
+**Description**: This procedure fetches data in a coarray from a specified image,
+  when the data to be copied are contiguous in linear memory on both sides.
+  The compiler can use this to implement reads from a coindexed object. 
+  It need not call this procedure when the coarray reference is not a coindexed object. 
+  This procedure blocks until the requested data has been successfully assigned
+  to the `current_image_buffer` argument. This procedure corresponds to a coindexed object
+  reference that reads contiguous coarray data.
     
 ```
-subroutine prif_put( &
-    coarray_handle, cosubscripts, value, first_element_addr, &
-    team, team_number, notify_ptr, stat, errmsg, errmsg_alloc)
+subroutine prif_get(...)
+  integer(c_int), intent(in) :: image_num
   type(prif_coarray_handle), intent(in) :: coarray_handle
-  integer(c_intmax_t), intent(in) :: cosubscripts(:)
-  type(*), intent(in), contiguous, target :: value(..)
-  type(c_ptr), intent(in) :: first_element_addr
-  type(prif_team_type), optional, intent(in) :: team
-  integer(c_intmax_t), optional, intent(in) :: team_number
-  integer(c_intptr_t), optional, intent(in) :: notify_ptr
+  integer(c_size_t), intent(in) :: offset
+  type(c_ptr), intent(in) :: current_image_buffer
+  integer(c_size_t), intent(in) :: size_in_bytes
   integer(c_int), intent(out), optional :: stat
   character(len=*), intent(inout), optional :: errmsg
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-**Further argument descriptions**:
+[Argument descriptions](#common-arguments-in-contiguous-coarray-access)
 
-* **`first_element_addr`**: The address of the current image's data in the coarray
-  corresponding to the first element to be assigned to on the identified image
+### `prif_get_indirect`
 
-### `prif_put_raw`
-
-**Description**: Assign to `size` number of contiguous bytes on given image, starting at
-  `remote_ptr`, copying from `current_image_buffer`.
+**Description**: This procedure implements the semantics of [`prif_get`](#prif_get)
+  but fetches `size_in_bytes` number of contiguous bytes from given image, starting at
+  `remote_ptr` on the given image, copying into `current_image_buffer`.
     
 ```
-subroutine prif_put_raw( &
-    image_num, current_image_buffer, remote_ptr, notify_ptr, size, &
-    stat, errmsg, errmsg_alloc)
+subroutine prif_get_indirect(...)
   integer(c_int), intent(in) :: image_num
-  type(c_ptr), intent(in) :: current_image_buffer
   integer(c_intptr_t), intent(in) :: remote_ptr
-  integer(c_intptr_t), optional, intent(in) :: notify_ptr
-  integer(c_size_t), intent(in) :: size
+  type(c_ptr), intent(in) :: current_image_buffer
+  integer(c_size_t), intent(in) :: size_in_bytes
   integer(c_int), intent(out), optional :: stat
   character(len=*), intent(inout), optional :: errmsg
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-**Further argument descriptions**:
+[Argument descriptions](#common-arguments-in-contiguous-coarray-access)
 
-* **`image_num`**: identifies the image to be written to in the initial team
-* **`current_image_buffer`**: pointer to the contiguous data which should be copied to the
-  identified image. 
-* **`size`**: how much data is to be transferred in bytes
-
-### `prif_put_raw_strided`
+### `prif_put`
 
-**Description**: Assign to memory on given image, starting at
-  `remote_ptr`, copying from `current_image_buffer`, progressing through `current_image_buffer`
-  in `current_image_buffer_stride` increments and through remote memory in `remote_ptr_stride`
-  increments, transferring `extent` number of elements in each dimension.
+**Description**: This procedure assigns to the elements of a coarray, when the data to be
+  assigned are contiguous in linear memory on both sides. 
+  The compiler can use this to implement assignment to a coindexed object. 
+  It need not call this procedure when the coarray reference is not a coindexed object. 
+  This procedure blocks on source completion. This procedure corresponds to a contiguous
+  coindexed object reference on the left hand side of an assignment statement.
     
 ```
-subroutine prif_put_raw_strided( &
-    image_num, current_image_buffer, remote_ptr, element_size, extent, &
-    remote_ptr_stride, current_image_buffer_stride, notify_ptr, &
-    stat, errmsg, errmsg_alloc)
+subroutine prif_put(...)
   integer(c_int), intent(in) :: image_num
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(in) :: offset
   type(c_ptr), intent(in) :: current_image_buffer
+  integer(c_size_t), intent(in) :: size_in_bytes
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+[Argument descriptions](#common-arguments-in-contiguous-coarray-access)
+
+### `prif_put_indirect`
+
+**Description**: This procedure implements the semantics of [`prif_put`](#prif_put) but
+   assigns to `size_in_bytes` number of contiguous bytes on given image, starting at
+  `remote_ptr` on the given image, copying from `current_image_buffer`.
+    
+```
+subroutine prif_put_indirect(...)
+  integer(c_int), intent(in) :: image_num
   integer(c_intptr_t), intent(in) :: remote_ptr
-  integer(c_size_t), intent(in) :: element_size
-  integer(c_size_t), intent(in) :: extent(:)
-  integer(c_ptrdiff_t), intent(in) :: remote_ptr_stride(:)
-  integer(c_ptrdiff_t), intent(in) :: current_image_buffer_stride(:)
-  integer(c_intptr_t), optional, intent(in) :: notify_ptr
+  type(c_ptr), intent(in) :: current_image_buffer
+  integer(c_size_t), intent(in) :: size_in_bytes
   integer(c_int), intent(out), optional :: stat
   character(len=*), intent(inout), optional :: errmsg
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-**Further argument descriptions**:
+[Argument descriptions](#common-arguments-in-contiguous-coarray-access)
 
-* `remote_ptr_stride`, `current_image_buffer_stride` and `extent` must each have size
-  equal to the rank of the referenced coarray.
-* **`image_num`**: identifies the image to be written to in the initial team
-* **`current_image_buffer`**: pointer to the data which should be copied to the
-  identified image.
-* **`element_size`**: The size of each element in bytes
-* **`extent`**: How many elements in each dimension should be transferred
-* **`remote_ptr_stride`**: The stride (in units of bytes) between elements in
-  each dimension on the specified image. Each component of stride may
-  independently be positive or negative, but (together with `extent`) must
-  specify a region of distinct (non-overlapping) elements. The striding starts
-  at the `remote_ptr`.
-* **`current_image_buffer_stride`**: The stride (in units of bytes) between elements in each dimension in
-  the current image buffer. Each component of stride may independently be positive or
-  negative, but (together with `extent`) must specify a region of distinct
-  (non-overlapping) elements. The striding starts at the `current_image_buffer`.
+### `prif_put_with_notify`
 
-### `prif_get`
+**Description**: This procedure implements the semantics of [`prif_put`](#prif_put) with the addition
+  of support for the semantics of the `NOTIFY=` specifier through a coarray handle
+  and an offset
 
-**Description**: This procedure fetches data in a coarray from a specified image,
-  when the elements are contiguous in linear memory on both sides.
-  The compiler can use this to implement reads from a _coindexed-named-object_. 
-  It need not call this procedure when the coarray reference is not a _coindexed-named-object_. 
-  This procedure blocks until the requested data has been successfully assigned
-  to the `value` argument. This procedure corresponds to any _coindexed-named-object_
-  reference that reads contiguous coarray data.
-    
 ```
-subroutine prif_get( &
-    coarray_handle, cosubscripts, first_element_addr, value, &
-    team, team_number, stat, errmsg, errmsg_alloc)
+subroutine prif_put_with_notify(...)
+  integer(c_int), intent(in) :: image_num
   type(prif_coarray_handle), intent(in) :: coarray_handle
-  integer(c_intmax_t), intent(in) :: cosubscripts(:)
-  type(c_ptr), intent(in) :: first_element_addr
-  type(*), intent(inout), contiguous, target :: value(..)
-  type(prif_team_type), optional, intent(in) :: team
-  integer(c_intmax_t), optional, intent(in) :: team_number
+  integer(c_size_t), intent(in) :: offset
+  type(c_ptr), intent(in) :: current_image_buffer
+  integer(c_size_t), intent(in) :: size_in_bytes
+  type(prif_coarray_handle), intent(in) :: notify_coarray_handle
+  integer(c_size_t), intent(in) :: notify_offset
   integer(c_int), intent(out), optional :: stat
   character(len=*), intent(inout), optional :: errmsg
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-**Further argument descriptions**:
+[Argument descriptions](#common-arguments-in-contiguous-coarray-access)
 
-* **`first_element_addr`**: The address of the data in the coarray
-  corresponding to the first element to be fetched from the identified image
+### `prif_put_with_notify_indirect`
 
-### `prif_get_raw`
+**Description**: This procedure implements the semantics of [`prif_put`](#prif_put) with the addition
+  of support for the semantics of the `NOTIFY=` specifier through a pointer
 
-**Description**: Fetch `size` number of contiguous bytes from given image, starting at
-  `remote_ptr`, copying into `current_image_buffer`.
-    
 ```
-subroutine prif_get_raw( &
-    image_num, current_image_buffer, remote_ptr, size, &
-    stat, errmsg, errmsg_alloc)
+subroutine prif_put_with_notify_indirect(...)
   integer(c_int), intent(in) :: image_num
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(in) :: offset
   type(c_ptr), intent(in) :: current_image_buffer
-  integer(c_intptr_t), intent(in) :: remote_ptr
-  integer(c_size_t), intent(in) :: size
+  integer(c_size_t), intent(in) :: size_in_bytes
+  integer(c_intptr_t), intent(in) :: notify_ptr
   integer(c_int), intent(out), optional :: stat
   character(len=*), intent(inout), optional :: errmsg
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-**Further argument descriptions**:
+[Argument descriptions](#common-arguments-in-contiguous-coarray-access)
 
-* **`image_num`**: identifies the image from which the data should be fetched
-  in the initial team
-* **`current_image_buffer`**: pointer to the contiguous memory into which the retrieved
-  data should be written
-* **`size`**: how much data is to be transferred in bytes
+### `prif_put_indirect_with_notify`
 
-### `prif_get_raw_strided`
+**Description**: This procedure implements the semantics of [`prif_put`](#prif_put) but
+   assigns to `size_in_bytes` number of contiguous bytes on given image, starting at
+  `remote_ptr` on the given image, copying from `current_image_buffer` and with support for the `NOTIFY=` specifier
+  through a coarray handle and offset
 
-**Description**: Copy from given image, starting at  `remote_ptr`, writing
-  into `current_image_buffer`, progressing through `current_image_buffer` in `current_image_buffer_stride`
-  increments and through remote memory in `remote_ptr_stride`
-  increments, transferring `extent` number of elements in each dimension.
-    
 ```
-subroutine prif_get_raw_strided( &
-    image_num, current_image_buffer, remote_ptr, element_size, extent, &
-    remote_ptr_stride, current_image_buffer_stride, &
-    stat, errmsg, errmsg_alloc)
+subroutine prif_put_indirect_with_notify(...)
   integer(c_int), intent(in) :: image_num
+  integer(c_intptr_t), intent(in) :: remote_ptr
   type(c_ptr), intent(in) :: current_image_buffer
+  integer(c_size_t), intent(in) :: size_in_bytes
+  type(prif_coarray_handle), intent(in) :: notify_coarray_handle
+  integer(c_size_t), intent(in) :: notify_offset
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+[Argument descriptions](#common-arguments-in-contiguous-coarray-access)
+
+### `prif_put_indirect_with_notify_indirect`
+
+**Description**: This procedure implements the semantics of [`prif_put`](#prif_put) but
+   assigns to `size_in_bytes` number of contiguous bytes on given image, starting at
+  `remote_ptr` on the given image, copying from `current_image_buffer` and with support for the `NOTIFY=` specifier
+  through a pointer
+
+```
+subroutine prif_put_indirect_with_notify_indirect(...)
+  integer(c_int), intent(in) :: image_num
   integer(c_intptr_t), intent(in) :: remote_ptr
-  integer(c_size_t), intent(in) :: element_size
-  integer(c_size_t), intent(in) :: extent(:)
-  integer(c_ptrdiff_t), intent(in) :: remote_ptr_stride(:)
-  integer(c_ptrdiff_t), intent(in) :: current_image_buffer_stride(:)
+  type(c_ptr), intent(in) :: current_image_buffer
+  integer(c_size_t), intent(in) :: size_in_bytes
+  integer(c_intptr_t), intent(in) :: notify_ptr
   integer(c_int), intent(out), optional :: stat
   character(len=*), intent(inout), optional :: errmsg
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-**Further argument descriptions**:
+[Argument descriptions](#common-arguments-in-contiguous-coarray-access)
 
-* `remote_ptr_stride`, `current_image_buffer_stride` and `extent` must each have size
-  equal to the rank of the referenced coarray.
-* **`image_num`**: identifies the image from which the data should be fetched
-  in the initial team
-* **`current_image_buffer`**: pointer to the memory into which the retrieved
-  data should be written
-* **`element_size`**: The size of each element in bytes
-* **`extent`**: How many elements in each dimension should be transferred
-* **`remote_ptr_stride`**: The stride (in units of bytes) between elements in
+
+## Strided Coarray Access
+
+
+### Common Arguments in Strided Coarray Access
+
+* **`image_num`**
+  * an argument identifying the image to be communicated with
+  * is permitted to identify the current image
+  * this image index is always relative to the initial team, regardless of the current team
+
+* **`coarray_handle`**: a handle for the descriptor of an established coarray to be accessed
+  by this operation. The combination of arguments must specify a set of
+  storage locations entirely contained within the elements of the coarray referred to by the handle.
+
+* **`offset`**: indicates an offset in bytes from the beginning of the elements in a remote coarray (indicated by `coarray_handle`) on a selected image (indicated by `image_num`)
+
+* **`remote_ptr`**: pointer to where on the identified image the data begins.
+  The referenced storage must have been allocated using `prif_allocate` or `prif_allocate_coarray`.
+
+* **`remote_stride`**: The stride (in units of bytes) between elements in
   each dimension on the specified image. Each component of stride may
   independently be positive or negative, but (together with `extent`) must
-  specify a region of distinct (non-overlapping) elements. The striding starts
-  at the `remote_ptr`.
-* **`current_image_buffer_stride`**: The stride (in units of bytes) between elements in each dimension in
+  specify a region of distinct (non-overlapping) elements. For the procedures that
+  provide the `remote_ptr` argument, the striding starts at the `remote_ptr`. For the
+  procedures that provide the `coarray_handle` and `offset` arguments, the striding
+  starts at the location that resides at `offset` bytes past the beginning of the
+  remote elements indicated by `coarray_handle`. 
+
+* **`current_image_buffer`**: pointer to memory on the calling image that either
+  contains the source data to be copied (puts) or is the destination memory 
+  for the data to be retrieved (gets). 
+
+* **`current_image_stride`**: The stride (in units of bytes) between elements in each dimension in
   the current image buffer. Each component of stride may independently be positive or
   negative, but (together with `extent`) must specify a region of distinct
   (non-overlapping) elements. The striding starts at the `current_image_buffer`.
 
-## Synchronization
+* **`element_size`**: The size of each element in bytes
 
-### `prif_sync_memory`
+* **`extent`**: How many elements in each dimension should be transferred.
+  `remote_stride`, `current_image_stride` and `extent` must all have equal size.
+
+* **`notify_coarray_handle`, `notify_offset`**: a coarray handle and byte offset
+  that identifies the location of a `prif_notify_type` variable to be updated
+  on completion of the put operation. That variable must be entirely contained
+  within the elements of the coarray referenced by `notify_coarray_handle`
+
+* **`notify_ptr`**: pointer on the identified image to the notify
+  variable that should be updated on completion of the put operation. The
+  referenced variable shall be of type `prif_notify_type`, and the storage
+  must have been allocated using `prif_allocate` or `prif_allocate_coarray`.
+
+### `prif_get_strided`
+
+**Description**: Copy from given image and given coarray, writing
+  into `current_image_buffer`, progressing through `current_image_buffer` in `current_image_stride`
+  increments and through remote memory in `remote_stride`
+  increments, transferring `extent` number of elements in each dimension.
+  This procedure blocks until the requested data has been successfully assigned
+  to the destination locations on the calling image. 
 
-**Description**: Ends one segment and begins another, waiting on any pending
-  communication operations with other images.
-    
 ```
-subroutine prif_sync_memory(stat, errmsg, errmsg_alloc)
+subroutine prif_get_strided(...)
+  integer(c_int), intent(in) :: image_num
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(in) :: offset
+  integer(c_ptrdiff_t), intent(in) :: remote_stride(:)
+  type(c_ptr), intent(in) :: current_image_buffer
+  integer(c_ptrdiff_t), intent(in) :: current_image_stride(:)
+  integer(c_size_t), intent(in) :: element_size
+  integer(c_size_t), intent(in) :: extent(:)
   integer(c_int), intent(out), optional :: stat
   character(len=*), intent(inout), optional :: errmsg
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
+[Argument descriptions](#common-arguments-in-strided-coarray-access)
 
-### `prif_sync_all`
+### `prif_get_strided_indirect`
 
-**Description**: Performs a synchronization of all images in the current team.
+**Description**: This procedure implements the semantics of [`prif_get_strided`](#prif_get_strided)
+  but starting at `remote_ptr` on the given image.
     
 ```
-subroutine prif_sync_all(stat, errmsg, errmsg_alloc)
+subroutine prif_get_strided_indirect(...)
+  integer(c_int), intent(in) :: image_num
+  integer(c_intptr_t), intent(in) :: remote_ptr
+  integer(c_ptrdiff_t), intent(in) :: remote_stride(:)
+  type(c_ptr), intent(in) :: current_image_buffer
+  integer(c_ptrdiff_t), intent(in) :: current_image_stride(:)
+  integer(c_size_t), intent(in) :: element_size
+  integer(c_size_t), intent(in) :: extent(:)
   integer(c_int), intent(out), optional :: stat
   character(len=*), intent(inout), optional :: errmsg
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
+[Argument descriptions](#common-arguments-in-strided-coarray-access)
 
-### `prif_sync_images`
+### `prif_put_strided`
 
-**Description**: Performs a synchronization with the listed images.
+**Description**: Assign to memory on a given image, starting at the location indicated by `coarray_handle`
+  and `offset`, copying from `current_image_buffer`, progressing through `current_image_buffer`
+  in `current_image_stride` increments and through remote memory in `remote_stride` increments,
+  transferring `extent` number of elements in each dimension.
+  This procedure blocks on source completion.
     
 ```
-subroutine prif_sync_images(image_set, stat, errmsg, errmsg_alloc)
-  integer(c_int), intent(in), optional :: image_set(:)
+subroutine prif_put_strided(...)
+  integer(c_int), intent(in) :: image_num
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(in) :: offset
+  integer(c_ptrdiff_t), intent(in) :: remote_stride(:)
+  type(c_ptr), intent(in) :: current_image_buffer
+  integer(c_ptrdiff_t), intent(in) :: current_image_stride(:)
+  integer(c_size_t), intent(in) :: element_size
+  integer(c_size_t), intent(in) :: extent(:)
   integer(c_int), intent(out), optional :: stat
   character(len=*), intent(inout), optional :: errmsg
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-**Further argument descriptions**:
-
-* **`image_set`**: The image inidices of the images in the current team with
-  which to synchronize. Given a scalar argument to SYNC IMAGES, the compiler should pass
-  its value in an array of size 1. Given an asterisk (`*`) argument to SYNC IMAGES, the compiler
-  should omit the `image_set` argument.
+[Argument descriptions](#common-arguments-in-strided-coarray-access)
 
-### `prif_sync_team`
+### `prif_put_strided_indirect`
 
-**Description**: Performs a synchronization with the images of the identified
-  team.
+**Description**: This procedure implements the semantics of [`prif_put_strided`](#prif_put_strided)
+  but starting at `remote_ptr` on the given image.
     
 ```
-subroutine prif_sync_team(team, stat, errmsg, errmsg_alloc)
-  type(prif_team_type), intent(in) :: team
+subroutine prif_put_strided_indirect(...)
+  integer(c_int), intent(in) :: image_num
+  integer(c_intptr_t), intent(in) :: remote_ptr
+  integer(c_ptrdiff_t), intent(in) :: remote_stride(:)
+  type(c_ptr), intent(in) :: current_image_buffer
+  integer(c_ptrdiff_t), intent(in) :: current_image_stride(:)
+  integer(c_size_t), intent(in) :: element_size
+  integer(c_size_t), intent(in) :: extent(:)
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+[Argument descriptions](#common-arguments-in-strided-coarray-access)
+
+### `prif_put_strided_with_notify`
+
+**Description**: This procedure implements the semantics of [`prif_put_strided`](#prif_put_strided)
+  with support for the `NOTIFY=` specifier through a coarray handle and an offset.
+    
+```
+subroutine prif_put_strided_with_notify(...)
+  integer(c_int), intent(in) :: image_num
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(in) :: offset
+  integer(c_ptrdiff_t), intent(in) :: remote_stride(:)
+  type(c_ptr), intent(in) :: current_image_buffer
+  integer(c_ptrdiff_t), intent(in) :: current_image_stride(:)
+  integer(c_size_t), intent(in) :: element_size
+  integer(c_size_t), intent(in) :: extent(:)
+  type(prif_coarray_handle), intent(in) :: notify_coarray_handle
+  integer(c_size_t), intent(in) :: notify_offset
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+[Argument descriptions](#common-arguments-in-strided-coarray-access)
+
+### `prif_put_strided_with_notify_indirect`
+
+**Description**: This procedure implements the semantics of [`prif_put_strided`](#prif_put_strided)
+  with support for the `NOTIFY=` specifier through a pointer.
+    
+```
+subroutine prif_put_strided_with_notify_indirect(...)
+  integer(c_int), intent(in) :: image_num
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(in) :: offset
+  integer(c_ptrdiff_t), intent(in) :: remote_stride(:)
+  type(c_ptr), intent(in) :: current_image_buffer
+  integer(c_ptrdiff_t), intent(in) :: current_image_stride(:)
+  integer(c_size_t), intent(in) :: element_size
+  integer(c_size_t), intent(in) :: extent(:)
+  integer(c_intptr_t), intent(in) :: notify_ptr
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+[Argument descriptions](#common-arguments-in-strided-coarray-access)
+
+### `prif_put_strided_indirect_with_notify`
+
+**Description**: This procedure implements the semantics of [`prif_put_strided`](#prif_put_strided)
+  but starting at `remote_ptr` on the given image and with support for the `NOTIFY=` specifier through a
+  coarray handle and an offset.
+
+```
+subroutine prif_put_strided_indirect_with_notify(...)
+  integer(c_int), intent(in) :: image_num
+  integer(c_intptr_t), intent(in) :: remote_ptr
+  integer(c_ptrdiff_t), intent(in) :: remote_stride(:)
+  type(c_ptr), intent(in) :: current_image_buffer
+  integer(c_ptrdiff_t), intent(in) :: current_image_stride(:)
+  integer(c_size_t), intent(in) :: element_size
+  integer(c_size_t), intent(in) :: extent(:)
+  type(prif_coarray_handle), intent(in) :: notify_coarray_handle
+  integer(c_size_t), intent(in) :: notify_offset
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+[Argument descriptions](#common-arguments-in-strided-coarray-access)
+
+### `prif_put_strided_indirect_with_notify_indirect`
+
+**Description**: This procedure implements the semantics of [`prif_put_strided`](#prif_put_strided)
+  but starting at `remote_ptr` on the given image and with support for the `NOTIFY=` specifier through a pointer.
+
+```
+subroutine prif_put_strided_indirect_with_notify_indirect(...)
+  integer(c_int), intent(in) :: image_num
+  integer(c_intptr_t), intent(in) :: remote_ptr
+  integer(c_ptrdiff_t), intent(in) :: remote_stride(:)
+  type(c_ptr), intent(in) :: current_image_buffer
+  integer(c_ptrdiff_t), intent(in) :: current_image_stride(:)
+  integer(c_size_t), intent(in) :: element_size
+  integer(c_size_t), intent(in) :: extent(:)
+  integer(c_intptr_t), intent(in) :: notify_ptr
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+[Argument descriptions](#common-arguments-in-strided-coarray-access)
+
+## `SYNC` Statements
+
+### `prif_sync_memory`
+
+**Description**: Ends one Fortran segment and begins another, waiting on any pending
+  communication operations with other images.
+    
+```
+subroutine prif_sync_memory(...)
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+
+### `prif_sync_all`
+
+**Description**: Performs a collective synchronization of all images in the current team.
+    
+```
+subroutine prif_sync_all(...)
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+
+### `prif_sync_images`
+
+**Description**: Performs a collective synchronization with the listed images.
+    
+```
+subroutine prif_sync_images(...)
+  integer(c_int), intent(in), optional :: image_set(:)
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+**Further argument descriptions**:
+
+* **`image_set`**: The image indices of the images in the current team with
+  which to synchronize. Image indices are relative to the current team.
+  Given a scalar argument to SYNC IMAGES, the compiler should pass
+  its value in an array of size 1. Given an asterisk (`*`) argument to SYNC IMAGES, the compiler
+  should omit the `image_set` argument.
+
+### `prif_sync_team`
+
+**Description**: Performs a collective synchronization with the images of the identified
+  team.
+    
+```
+subroutine prif_sync_team(...)
+  type(prif_team_type), intent(in) :: team
   integer(c_int), intent(out), optional :: stat
   character(len=*), intent(inout), optional :: errmsg
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
@@ -1309,6 +1691,29 @@ end subroutine
 
 * **`team`**: Identifies the team to synchronize.
 
+
+## Locks and Unlocks
+
+### Common Arguments in Locks and Unlocks
+
+* **`image_num`**
+  * an argument identifying the image to be communicated with
+  * is permitted to identify the current image
+  * this image index is always relative to the initial team, regardless of the current team
+
+* **`coarray_handle`**: a handle for the descriptor of an established coarray to be accessed by this operation. 
+Together with `offset` must identify the location of a `prif_lock_type` variable entirely contained within the elements of the coarray referred to by the handle.  
+
+* **`offset`**: indicates an offset in bytes from the beginning of the elements in a remote coarray (indicated by `coarray_handle`) on a selected image (indicated by `image_num`)
+
+* **`lock_var_ptr`**: a pointer to the base address of the lock variable to
+  be locked or unlocked on the identified image. The referenced variable shall be of
+  type `prif_lock_type`, and the referenced storage must have been allocated
+  using `prif_allocate` or `prif_allocate_coarray`.
+
+* **`acquired_lock`**: if present is set to `.true.` if the lock was locked
+  by the current image, or set to `.false.` otherwise
+
 ### `prif_lock`
 
 **Description**: Waits until the identified lock variable is unlocked
@@ -1319,27 +1724,34 @@ end subroutine
   locked by the current image, then an error condition occurs.
     
 ```
-subroutine prif_lock( &
-    image_num, lock_var_ptr, acquired_lock, &
-    stat, errmsg, errmsg_alloc)
+subroutine prif_lock(...)
   integer(c_int), intent(in) :: image_num
-  integer(c_intptr_t), intent(in) :: lock_var_ptr
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(in) :: offset
   logical(c_bool), intent(out), optional :: acquired_lock
   integer(c_int), intent(out), optional :: stat
   character(len=*), intent(inout), optional :: errmsg
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-**Further argument descriptions**:
+[Argument descriptions](#common-arguments-in-locks-and-unlocks)
 
-* **`image_num`**: the image index in the initial team for the lock variable
-  to be locked
-* **`lock_var_ptr`**: a pointer to the base address of the lock variable to
-  be locked on the identified image, typically obtained from a call to
-  `prif_base_pointer`. The referenced variable shall be of type `prif_lock_type`,
-  and the referenced storage must have been allocated using `prif_allocate_coarray` or `prif_allocate`.
-* **`acquired_lock`**: if present is set to `.true.` if the lock was locked
-  by the current image, or set to `.false.` otherwise
+### `prif_lock_indirect`
+
+**Description**: This procedure implements the semantics of `prif_lock`,
+  but with the lock variable identified by `lock_var_ptr`.
+
+```
+subroutine prif_lock_indirect(...)
+  integer(c_int), intent(in) :: image_num
+  integer(c_intptr_t), intent(in) :: lock_var_ptr
+  logical(c_bool), intent(out), optional :: acquired_lock
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+[Argument descriptions](#common-arguments-in-locks-and-unlocks)
 
 ### `prif_unlock`
 
@@ -1348,8 +1760,24 @@ end subroutine
   condition occurs.
     
 ```
-subroutine prif_unlock( &
-    image_num, lock_var_ptr, stat, errmsg, errmsg_alloc)
+subroutine prif_unlock(...)
+  integer(c_int), intent(in) :: image_num
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(in) :: offset
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+[Argument descriptions](#common-arguments-in-locks-and-unlocks)
+
+### `prif_unlock_indirect`
+
+**Description**: This procedure implements the semantics of `prif_unlock`,
+  but with the lock variable identified by `lock_var_ptr`.
+
+```
+subroutine prif_unlock_indirect(...)
   integer(c_int), intent(in) :: image_num
   integer(c_intptr_t), intent(in) :: lock_var_ptr
   integer(c_int), intent(out), optional :: stat
@@ -1357,29 +1785,23 @@ subroutine prif_unlock( &
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-**Further argument descriptions**:
+[Argument descriptions](#common-arguments-in-locks-and-unlocks)
 
-* **`image_num`**: the image index in the initial team for the lock variable
-  to be unlocked
-* **`lock_var_ptr`**: a pointer to the base address of the lock variable to
-  be unlocked on the identified image, typically obtained from a call to
-  `prif_base_pointer`. The referenced variable shall be of type `prif_lock_type`,
-  and the referenced storage must have been allocated using `prif_allocate_coarray` or `prif_allocate`.
+## Critical
 
 ### `prif_critical`
 
 **Description**: The compiler shall define a coarray, and establish (allocate)
-  it in the initial team, that shall only be used to begin and end the critical
-  block. An efficient implementation will likely define one for each critical
+  it in the initial team, that shall only be used to begin and end critical
+  blocks. An efficient compiler may allocate one such coarray for each critical
   block. The coarray shall be a scalar coarray of type `prif_critical_type` and
   the associated coarray handle shall be passed to this procedure. This
   procedure waits until any other image which has executed this procedure with
-  a corresponding coarray handle has subsequently executed `prif_end_critical`
-  with the same coarray handle an identical number of times.
+  a corresponding coarray has subsequently executed `prif_end_critical`
+  with the same coarray an identical number of times.
     
 ```
-subroutine prif_critical( &
-    critical_coarray, stat, errmsg, errmsg_alloc)
+subroutine prif_critical(...)
   type(prif_coarray_handle), intent(in) :: critical_coarray
   integer(c_int), intent(out), optional :: stat
   character(len=*), intent(inout), optional :: errmsg
@@ -1397,7 +1819,7 @@ end subroutine
   the provided coarray handle.
     
 ```
-subroutine prif_end_critical(critical_coarray)
+subroutine prif_end_critical(...)
   type(prif_coarray_handle), intent(in) :: critical_coarray
 end subroutine
 ```
@@ -1408,13 +1830,40 @@ end subroutine
 
 ## Events and Notifications
 
+### Common Arguments
+
+* **`image_num`**
+  * an argument identifying the image to be communicated with
+  * is permitted to identify the current image
+  * this image index is always relative to the initial team, regardless of the current team
+
 ### `prif_event_post`
 
 **Description**: Atomically increment the count of the event variable by one.
     
 ```
-subroutine prif_event_post( &
-    image_num, event_var_ptr, stat, errmsg, errmsg_alloc)
+subroutine prif_event_post(...)
+  integer(c_int), intent(in) :: image_num
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(in) :: offset
+  integer(c_int), intent(out), optional :: stat
+  character(len=*), intent(inout), optional :: errmsg
+  character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
+end subroutine
+```
+**Further argument descriptions**:
+
+* **`coarray_handle`**: a handle for the descriptor of an established coarray to be accessed by this operation. 
+Together with `offset` must identify the location of a `prif_event_type` variable entirely contained within the elements of the coarray referred to by the handle.  
+
+* **`offset`**: indicates an offset in bytes from the beginning of the elements in a remote coarray (indicated by `coarray_handle`) on a selected image (indicated by `image_num`)
+
+### `prif_event_post_indirect`
+
+**Description**: Atomically increment the count of the event variable by one.
+    
+```
+subroutine prif_event_post_indirect(...)
   integer(c_int), intent(in) :: image_num
   integer(c_intptr_t), intent(in) :: event_var_ptr
   integer(c_int), intent(out), optional :: stat
@@ -1424,12 +1873,10 @@ end subroutine
 ```
 **Further argument descriptions**:
 
-* **`image_num`**: the image index in the initial team for the event variable
-  to be incremented
 * **`event_var_ptr`**: a pointer to the base address of the event variable to
-  be incremented on the identified image, typically obtained from a call to
-  `prif_base_pointer`. The referenced variable shall be of type `prif_event_type`,
-  and the referenced storage must have been allocated using `prif_allocate_coarray` or `prif_allocate`.
+  be incremented on the identified image. The referenced variable shall be of
+  type `prif_event_type`, and the referenced storage must have been allocated
+  using `prif_allocate` or `prif_allocate_coarray`.
 
 ### `prif_event_wait`
 
@@ -1438,8 +1885,7 @@ end subroutine
   value. If `until_count` is not present it has the value 1.
     
 ```
-subroutine prif_event_wait( &
-    event_var_ptr, until_count, stat, errmsg, errmsg_alloc)
+subroutine prif_event_wait(...)
   type(c_ptr), intent(in) :: event_var_ptr
   integer(c_intmax_t), intent(in), optional :: until_count
   integer(c_int), intent(out), optional :: stat
@@ -1460,7 +1906,7 @@ end subroutine
 **Description**: Query the count of an event variable on the calling image.
     
 ```
-subroutine prif_event_query(event_var_ptr, count, stat)
+subroutine prif_event_query(...)
   type(c_ptr), intent(in) :: event_var_ptr
   integer(c_intmax_t), intent(out) :: count
   integer(c_int), intent(out), optional :: stat
@@ -1478,8 +1924,7 @@ end subroutine
 **Description**: Wait on notification of an incoming put operation
     
   ```
-    subroutine prif_notify_wait( &
-        notify_var_ptr, until_count, stat, errmsg, errmsg_alloc)
+    subroutine prif_notify_wait(...)
       type(c_ptr), intent(in) :: notify_var_ptr
       integer(c_intmax_t), intent(in), optional :: until_count
       integer(c_int), intent(out), optional :: stat
@@ -1510,8 +1955,7 @@ tree formed by team creation.
   same value for `team_number`.
     
 ```
-subroutine prif_form_team( &
-    team_number, team, new_index, stat, errmsg, errmsg_alloc)
+subroutine prif_form_team(...)
   integer(c_intmax_t), intent(in) :: team_number
   type(prif_team_type), intent(out) :: team
   integer(c_int), intent(in), optional :: new_index
@@ -1533,7 +1977,7 @@ end subroutine
   `PRIF_INITIAL_TEAM`
     
 ```
-subroutine prif_get_team(level, team)
+subroutine prif_get_team(...)
   integer(c_int), intent(in), optional :: level
   type(prif_team_type), intent(out) :: team
 end subroutine
@@ -1549,7 +1993,7 @@ end subroutine
   team. If `team` is not present, the current team is used.
     
 ```
-subroutine prif_team_number(team, team_number)
+subroutine prif_team_number(...)
   type(prif_team_type), intent(in), optional :: team
   integer(c_intmax_t), intent(out) :: team_number
 end subroutine
@@ -1560,11 +2004,11 @@ end subroutine
 **Description**: changes the current team to the specified team. For any
   associate names specified in the `CHANGE TEAM` statement the compiler should
   follow a call to this procedure with calls to `prif_alias_create` to create
-  the alias coarray handle, and associate any non-coindexed references to the
+  an alias coarray descriptor, and associate any non-coindexed references to the
   associate name within the `CHANGE TEAM` construct with the selector.
     
 ```
-subroutine prif_change_team(team, stat, errmsg, errmsg_alloc)
+subroutine prif_change_team(...)
   type(prif_team_type), intent(in) :: team
   integer(c_int), intent(out), optional :: stat
   character(len=*), intent(inout), optional :: errmsg
@@ -1577,11 +2021,11 @@ end subroutine
 **Description**: Changes the current team to the parent team. During the
   execution of `prif_end_team`, the PRIF implementation will deallocate any coarrays that became allocated during the
   change team construct. Prior to invoking `prif_end_team`, the compiler is
-  responsible for invoking `prif_alias_destroy` to delete any `prif_coarray_handle`
-  aliases created as part of the `CHANGE TEAM` construct.
+  responsible for invoking `prif_alias_destroy` to delete any coarray alias descriptors
+  created as part of the `CHANGE TEAM` construct.
     
 ```
-subroutine prif_end_team(stat, errmsg, errmsg_alloc)
+subroutine prif_end_team(...)
   integer(c_int), intent(out), optional :: stat
   character(len=*), intent(inout), optional :: errmsg
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
@@ -1590,16 +2034,16 @@ end subroutine
 
 ## Collectives
 
-### Common Arguments
+### Common Arguments in Collectives
 
 * **`a`**
   * Argument for all the collective subroutines: [`prif_co_broadcast`](#prif_co_broadcast),
     [`prif_co_max`](#prif_co_max), [`prif_co_min`](#prif_co_min),
-    [`prif_co_reduce`](#prif_co_reduce), [`prif_co_sum`](#prif_co_sum),
+    [`prif_co_sum`](#prif_co_sum), [`prif_co_reduce`](#prif_co_reduce).
   * may be any type for `prif_co_broadcast` or `prif_co_reduce`, any numeric for `prif_co_sum`,
     and integer, real, or character for `prif_co_min` or `prif_co_max`
   * is always `intent(inout)`
-  * for `prif_co_max`, `prif_co_min`, `prif_co_reduce`, `prif_co_sum` it is assigned the value
+  * for `prif_co_max`, `prif_co_min`, `prif_co_sum`, `prif_co_reduce` it is assigned the value
     computed by the collective operation, if no error conditions occurs and if
     `result_image` is absent, or the executing image is the one identified by
     `result_image`, otherwise `a` becomes undefined
@@ -1615,8 +2059,7 @@ end subroutine
 **Description**: Broadcast value to images
     
 ```
-subroutine prif_co_broadcast( &
-    a, source_image, stat, errmsg, errmsg_alloc)
+subroutine prif_co_broadcast(...)
   type(*), intent(inout), contiguous, target :: a(..)
   integer(c_int), intent(in) :: source_image
   integer(c_int), optional, intent(out) :: stat
@@ -1624,14 +2067,14 @@ subroutine prif_co_broadcast( &
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
+[Argument descriptions](#common-arguments-in-collectives)
 
 ### `prif_co_max`
 
 **Description**: Compute maximum value across images
     
 ```
-subroutine prif_co_max( &
-    a, result_image, stat, errmsg, errmsg_alloc)
+subroutine prif_co_max(...)
   type(*), intent(inout), contiguous, target :: a(..)
   integer(c_int), intent(in), optional :: result_image
   integer(c_int), intent(out), optional :: stat
@@ -1639,14 +2082,14 @@ subroutine prif_co_max( &
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
+[Argument descriptions](#common-arguments-in-collectives)
 
 ### `prif_co_min`
 
 **Description**: Compute minimum value across images
     
 ```
-subroutine prif_co_min( &
-    a, result_image, stat, errmsg, errmsg_alloc)
+subroutine prif_co_min(...)
   type(*), intent(inout), contiguous, target :: a(..)
   integer(c_int), intent(in), optional :: result_image
   integer(c_int), intent(out), optional :: stat
@@ -1654,234 +2097,328 @@ subroutine prif_co_min( &
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
+[Argument descriptions](#common-arguments-in-collectives)
 
-### `prif_co_reduce`
+### `prif_co_sum`
 
-**Description**: Generalized reduction across images
+**Description**: Compute sum across images
     
 ```
-subroutine prif_co_reduce( &
-    a, operation, result_image, stat, errmsg, errmsg_alloc)
+subroutine prif_co_sum(...)
   type(*), intent(inout), contiguous, target :: a(..)
-  type(c_funptr), value :: operation
   integer(c_int), intent(in), optional :: result_image
   integer(c_int), intent(out), optional :: stat
   character(len=*), intent(inout), optional :: errmsg
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
-**Further argument descriptions**:
-
-* **`operation`**: the result of `C_FUNLOC` on a reduction operation procedure that meets the 
-  requirements outlined in the Fortran standard for the corresponding argument to CO_REDUCE.
-  Note the procedure itself need NOT be interoperable (i.e. `BIND(C)`) nor are the
-  arguments required to have interoperable types.
+[Argument descriptions](#common-arguments-in-collectives)
 
-### `prif_co_sum`
+### `prif_co_reduce`
 
-**Description**: Compute sum across images
+**Description**: Generalized reduction across images
     
 ```
-subroutine prif_co_sum( &
-    a, result_image, stat, errmsg, errmsg_alloc)
+subroutine prif_co_reduce(...)
   type(*), intent(inout), contiguous, target :: a(..)
+  type(c_funptr), value :: operation
   integer(c_int), intent(in), optional :: result_image
   integer(c_int), intent(out), optional :: stat
   character(len=*), intent(inout), optional :: errmsg
   character(len=:), intent(inout), allocatable, optional :: errmsg_alloc
 end subroutine
 ```
+[Argument descriptions](#common-arguments-in-collectives)
+
+**Further argument descriptions**:
+
+* **`operation`**: the result of `C_FUNLOC` on a reduction operation procedure that meets the 
+  requirements outlined in the Fortran standard for the corresponding argument to CO_REDUCE.
+  Note the procedure itself need NOT be interoperable (i.e. `BIND(C)`) nor are the
+  arguments required to have interoperable types.
 
 ## Atomic Memory Operations
 
 All atomic operations are fully blocking operations, meaning they do not return to the caller
 until after all semantics involving the atomic variable are fully committed with respect to all images.
 
-### Common Arguments
-
-* **`atom_remote_ptr`**
-  * Argument for all of the atomic subroutines
-  * is type `integer(c_intptr_t)`
-  * is the location of the atomic variable on the identified image to be
-    operated on
-  * it is the responsibility of the compiler to perform the necessary operations
-    on the coarray or coindexed actual argument to compute the relevant remote pointer
-  * The referenced storage must have been allocated using `prif_allocate_coarray` or `prif_allocate`.
+### Common Arguments in Atomic Memory Operations
 
 * **`image_num`**
   * an argument identifying the image to be communicated with
   * is permitted to identify the current image
-  * the image index is always relative to the initial team, unless otherwise specified
+  * this image index is always relative to the initial team, regardless of the current team
 
-### Non-Fetching Atomic Operations
+* **`coarray_handle`**: a handle for the descriptor of an established coarray to be
+  accessed by the operation. In combination with `offset`, must refer to storage within
+  the elements of the coarray referred to by the handle.
 
-**Description**: Each of the following procedures atomically performs the 
-specified operation on a variable in a coarray.
+* **`offset`**: indicates an offset in bytes from the beginning of the elements in
+  a remote coarray (indicated by `coarray_handle`) on a selected image (indicated by `image_num`)
+
+* **`atom_remote_ptr`**: Is the location of the atomic variable on the identified image to be
+  operated on. The referenced storage must have been allocated using `prif_allocate`
+  or `prif_allocate_coarray`.
+
+* **`value`**: value to perform the operation with (non-fetching and fetching
+  operations) or value to which the variable shall be set, or retrieved from the
+  variable (atomic access procedures)
+
+* **`old`**: is set to the initial value of the atomic variable
 
-#### Common Argument
+### Non-Fetching Atomic Operations
 
-* **`value`**: value to perform the operation with
+**Description**: Each of the following procedures atomically performs the 
+specified operation on a coindexed object.
 
 #### `prif_atomic_add`, Addition
 
 ```
-subroutine prif_atomic_add(atom_remote_ptr, image_num, value, stat)
-  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+subroutine prif_atomic_add(...)
+  integer(c_int), intent(in) :: image_num
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(in) :: offset
+  integer(PRIF_ATOMIC_INT_KIND), intent(in) :: value
+  integer(c_int), intent(out), optional :: stat
+end subroutine
+
+subroutine prif_atomic_add_indirect(...)
   integer(c_int), intent(in) :: image_num
-  integer(atomic_int_kind), intent(in) :: value
+  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+  integer(PRIF_ATOMIC_INT_KIND), intent(in) :: value
   integer(c_int), intent(out), optional :: stat
 end subroutine
 ```
+[Argument descriptions](#common-arguments-in-atomic-memory-operations)
 
 #### `prif_atomic_and`, Bitwise And
 
 ```
-subroutine prif_atomic_and(atom_remote_ptr, image_num, value, stat)
-  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+subroutine prif_atomic_and(...)
   integer(c_int), intent(in) :: image_num
-  integer(atomic_int_kind), intent(in) :: value
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(in) :: offset
+  integer(PRIF_ATOMIC_INT_KIND), intent(in) :: value
+  integer(c_int), intent(out), optional :: stat
+end subroutine
+
+subroutine prif_atomic_and_indirect(...)
+  integer(c_int), intent(in) :: image_num
+  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+  integer(PRIF_ATOMIC_INT_KIND), intent(in) :: value
   integer(c_int), intent(out), optional :: stat
 end subroutine
 ```
+[Argument descriptions](#common-arguments-in-atomic-memory-operations)
 
 #### `prif_atomic_or`, Bitwise Or
 
 ```
-subroutine prif_atomic_or(atom_remote_ptr, image_num, value, stat)
-  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+subroutine prif_atomic_or(...)
+  integer(c_int), intent(in) :: image_num
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(in) :: offset
+  integer(PRIF_ATOMIC_INT_KIND), intent(in) :: value
+  integer(c_int), intent(out), optional :: stat
+end subroutine
+
+subroutine prif_atomic_or_indirect(...)
   integer(c_int), intent(in) :: image_num
-  integer(atomic_int_kind), intent(in) :: value
+  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+  integer(PRIF_ATOMIC_INT_KIND), intent(in) :: value
   integer(c_int), intent(out), optional :: stat
 end subroutine
 ```
+[Argument descriptions](#common-arguments-in-atomic-memory-operations)
 
 #### `prif_atomic_xor`, Bitwise Xor
 
 ```
-subroutine prif_atomic_xor(atom_remote_ptr, image_num, value, stat)
-  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+subroutine prif_atomic_xor(...)
+  integer(c_int), intent(in) :: image_num
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(in) :: offset
+  integer(PRIF_ATOMIC_INT_KIND), intent(in) :: value
+  integer(c_int), intent(out), optional :: stat
+end subroutine
+
+subroutine prif_atomic_xor_indirect(...)
   integer(c_int), intent(in) :: image_num
-  integer(atomic_int_kind), intent(in) :: value
+  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+  integer(PRIF_ATOMIC_INT_KIND), intent(in) :: value
   integer(c_int), intent(out), optional :: stat
 end subroutine
 ```
+[Argument descriptions](#common-arguments-in-atomic-memory-operations)
 
 ### Fetching Atomic Operations
 
 **Description**: Each of the following procedures atomically performs the 
-specified operation on a variable in a coarray, and retrieves the
+specified operation on a coindexed object, and retrieves the
 original value.
 
-#### Common Arguments
-
-* **`value`**: value to perform the operation with
-* **`old`**: is set to the initial value of the atomic variable
-
 #### `prif_atomic_fetch_add`, Addition
 
 ```
-subroutine prif_atomic_fetch_add( &
-    atom_remote_ptr, image_num, value, old, stat)
-  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+subroutine prif_atomic_fetch_add(...)
   integer(c_int), intent(in) :: image_num
-  integer(atomic_int_kind), intent(in) :: value
-  integer(atomic_int_kind), intent(out) :: old
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(in) :: offset
+  integer(PRIF_ATOMIC_INT_KIND), intent(in) :: value
+  integer(PRIF_ATOMIC_INT_KIND), intent(out) :: old
+  integer(c_int), intent(out), optional :: stat
+end subroutine
+
+subroutine prif_atomic_fetch_add_indirect(...)
+  integer(c_int), intent(in) :: image_num
+  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+  integer(PRIF_ATOMIC_INT_KIND), intent(in) :: value
+  integer(PRIF_ATOMIC_INT_KIND), intent(out) :: old
   integer(c_int), intent(out), optional :: stat
 end subroutine
 ```
+[Argument descriptions](#common-arguments-in-atomic-memory-operations)
 
 #### `prif_atomic_fetch_and`, Bitwise And
 
 ```
-subroutine prif_atomic_fetch_and( &
-    atom_remote_ptr, image_num, value, old, stat)
-  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+subroutine prif_atomic_fetch_and(...)
+  integer(c_int), intent(in) :: image_num
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(in) :: offset
+  integer(PRIF_ATOMIC_INT_KIND), intent(in) :: value
+  integer(PRIF_ATOMIC_INT_KIND), intent(out) :: old
+  integer(c_int), intent(out), optional :: stat
+end subroutine
+
+subroutine prif_atomic_fetch_and_indirect(...)
   integer(c_int), intent(in) :: image_num
-  integer(atomic_int_kind), intent(in) :: value
-  integer(atomic_int_kind), intent(out) :: old
+  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+  integer(PRIF_ATOMIC_INT_KIND), intent(in) :: value
+  integer(PRIF_ATOMIC_INT_KIND), intent(out) :: old
   integer(c_int), intent(out), optional :: stat
 end subroutine
 ```
+[Argument descriptions](#common-arguments-in-atomic-memory-operations)
 
 #### `prif_atomic_fetch_or`, Bitwise Or
 
 ```
-subroutine prif_atomic_fetch_or( &
-    atom_remote_ptr, image_num, value, old, stat)
-  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+subroutine prif_atomic_fetch_or(...)
   integer(c_int), intent(in) :: image_num
-  integer(atomic_int_kind), intent(in) :: value
-  integer(atomic_int_kind), intent(out) :: old
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(in) :: offset
+  integer(PRIF_ATOMIC_INT_KIND), intent(in) :: value
+  integer(PRIF_ATOMIC_INT_KIND), intent(out) :: old
+  integer(c_int), intent(out), optional :: stat
+end subroutine
+
+subroutine prif_atomic_fetch_or_indirect(...)
+  integer(c_int), intent(in) :: image_num
+  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+  integer(PRIF_ATOMIC_INT_KIND), intent(in) :: value
+  integer(PRIF_ATOMIC_INT_KIND), intent(out) :: old
   integer(c_int), intent(out), optional :: stat
 end subroutine
 ```
+[Argument descriptions](#common-arguments-in-atomic-memory-operations)
 
 #### `prif_atomic_fetch_xor`, Bitwise Xor
 
 ```
-subroutine prif_atomic_fetch_xor( &
-    atom_remote_ptr, image_num, value, old, stat)
-  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+subroutine prif_atomic_fetch_xor(...)
   integer(c_int), intent(in) :: image_num
-  integer(atomic_int_kind), intent(in) :: value
-  integer(atomic_int_kind), intent(out) :: old
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(in) :: offset
+  integer(PRIF_ATOMIC_INT_KIND), intent(in) :: value
+  integer(PRIF_ATOMIC_INT_KIND), intent(out) :: old
+  integer(c_int), intent(out), optional :: stat
+end subroutine
+
+subroutine prif_atomic_fetch_xor_indirect(...)
+  integer(c_int), intent(in) :: image_num
+  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+  integer(PRIF_ATOMIC_INT_KIND), intent(in) :: value
+  integer(PRIF_ATOMIC_INT_KIND), intent(out) :: old
   integer(c_int), intent(out), optional :: stat
 end subroutine
 ```
+[Argument descriptions](#common-arguments-in-atomic-memory-operations)
 
 ### Atomic Access
 
 **Description**: The following procedures atomically 
-set or retrieve the value of a variable in a coarray.
-
-#### Common Argument
-
-* **`value`**: value to which the variable shall be set, or retrieved from the
-  variable
+set or retrieve the value of a coindexed object.
 
 #### `prif_atomic_define`, set variable's value
 
 ```
-interface prif_atomic_define
-  subroutine prif_atomic_define_int( &
-      atom_remote_ptr, image_num, value, stat)
-    integer(c_intptr_t), intent(in) :: atom_remote_ptr
-    integer(c_int), intent(in) :: image_num
-    integer(atomic_int_kind), intent(in) :: value
-    integer(c_int), intent(out), optional :: stat
-  end subroutine
+subroutine prif_atomic_define_int(...)
+  integer(c_int), intent(in) :: image_num
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(in) :: offset
+  integer(PRIF_ATOMIC_INT_KIND), intent(in) :: value
+  integer(c_int), intent(out), optional :: stat
+end subroutine
 
-  subroutine prif_atomic_define_logical( &
-      atom_remote_ptr, image_num, value, stat)
-    integer(c_intptr_t), intent(in) :: atom_remote_ptr
-    integer(c_int), intent(in) :: image_num
-    logical(atomic_logical_kind), intent(in) :: value
-    integer(c_int), intent(out), optional :: stat
-  end subroutine
-end interface
+subroutine prif_atomic_define_logical(...)
+  integer(c_int), intent(in) :: image_num
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(in) :: offset
+  logical(PRIF_ATOMIC_LOGICAL_KIND), intent(in) :: value
+  integer(c_int), intent(out), optional :: stat
+end subroutine
+
+subroutine prif_atomic_define_int_indirect(...)
+  integer(c_int), intent(in) :: image_num
+  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+  integer(PRIF_ATOMIC_INT_KIND), intent(in) :: value
+  integer(c_int), intent(out), optional :: stat
+end subroutine
+
+subroutine prif_atomic_define_logical_indirect(...)
+  integer(c_int), intent(in) :: image_num
+  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+  logical(PRIF_ATOMIC_LOGICAL_KIND), intent(in) :: value
+  integer(c_int), intent(out), optional :: stat
+end subroutine
 ```
+[Argument descriptions](#common-arguments-in-atomic-memory-operations)
 
 #### `prif_atomic_ref`, retrieve variable's value
 
 ```
-interface prif_atomic_ref
-  subroutine prif_atomic_ref_int( &
-      value, atom_remote_ptr, image_num, stat)
-    integer(atomic_int_kind), intent(out) :: value
-    integer(c_intptr_t), intent(in) :: atom_remote_ptr
-    integer(c_int), intent(in) :: image_num
-    integer(c_int), intent(out), optional :: stat
-  end subroutine
+subroutine prif_atomic_ref_int(...)
+  integer(c_int), intent(in) :: image_num
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(in) :: offset
+  integer(PRIF_ATOMIC_INT_KIND), intent(out) :: value
+  integer(c_int), intent(out), optional :: stat
+end subroutine
 
-  subroutine prif_atomic_ref_logical( &
-      value, atom_remote_ptr, image_num, stat)
-    logical(atomic_logical_kind), intent(out) :: value
-    integer(c_intptr_t), intent(in) :: atom_remote_ptr
-    integer(c_int), intent(in) :: image_num
-    integer(c_int), intent(out), optional :: stat
-  end subroutine
-end interface
+subroutine prif_atomic_ref_logical(...)
+  integer(c_int), intent(in) :: image_num
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(in) :: offset
+  logical(PRIF_ATOMIC_LOGICAL_KIND), intent(out) :: value
+  integer(c_int), intent(out), optional :: stat
+end subroutine
+
+subroutine prif_atomic_ref_int_indirect(...)
+  integer(c_int), intent(in) :: image_num
+  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+  integer(PRIF_ATOMIC_INT_KIND), intent(out) :: value
+  integer(c_int), intent(out), optional :: stat
+end subroutine
+
+subroutine prif_atomic_ref_logical_indirect(...)
+  integer(c_int), intent(in) :: image_num
+  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+  logical(PRIF_ATOMIC_LOGICAL_KIND), intent(out) :: value
+  integer(c_int), intent(out), optional :: stat
+end subroutine
 ```
+[Argument descriptions](#common-arguments-in-atomic-memory-operations)
 
 ### `prif_atomic_cas`
 
@@ -1889,34 +2426,50 @@ end interface
 If the value of the atomic variable is equal to the value of the `compare`
 argument, set it to the value of the `new` argument. The `old` argument is set
 to the initial value of the atomic variable.
-    
 
 ```
-interface prif_atomic_cas
-  subroutine prif_atomic_cas_int( &
-      atom_remote_ptr, image_num, old, compare, new, stat)
-    integer(c_intptr_t), intent(in) :: atom_remote_ptr
-    integer(c_int), intent(in) :: image_num
-    integer(atomic_int_kind), intent(out) :: old
-    integer(atomic_int_kind), intent(in) :: compare
-    integer(atomic_int_kind), intent(in) :: new
-    integer(c_int), intent(out), optional :: stat
-  end subroutine
+subroutine prif_atomic_cas_int(...)
+  integer(c_int), intent(in) :: image_num
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(in) :: offset
+  integer(PRIF_ATOMIC_INT_KIND), intent(out) :: old
+  integer(PRIF_ATOMIC_INT_KIND), intent(in) :: compare
+  integer(PRIF_ATOMIC_INT_KIND), intent(in) :: new
+  integer(c_int), intent(out), optional :: stat
+end subroutine
 
-  subroutine prif_atomic_cas_logical( &
-      atom_remote_ptr, image_num, old, compare, new, stat)
-    integer(c_intptr_t), intent(in) :: atom_remote_ptr
-    integer(c_int), intent(in) :: image_num
-    logical(atomic_logical_kind), intent(out) :: old
-    logical(atomic_logical_kind), intent(in) :: compare
-    logical(atomic_logical_kind), intent(in) :: new
-    integer(c_int), intent(out), optional :: stat
-  end subroutine
-end interface
+subroutine prif_atomic_cas_logical(...)
+  integer(c_int), intent(in) :: image_num
+  type(prif_coarray_handle), intent(in) :: coarray_handle
+  integer(c_size_t), intent(in) :: offset
+  logical(PRIF_ATOMIC_LOGICAL_KIND), intent(out) :: old
+  logical(PRIF_ATOMIC_LOGICAL_KIND), intent(in) :: compare
+  logical(PRIF_ATOMIC_LOGICAL_KIND), intent(in) :: new
+  integer(c_int), intent(out), optional :: stat
+end subroutine
+
+subroutine prif_atomic_cas_int_indirect(...)
+  integer(c_int), intent(in) :: image_num
+  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+  integer(PRIF_ATOMIC_INT_KIND), intent(out) :: old
+  integer(PRIF_ATOMIC_INT_KIND), intent(in) :: compare
+  integer(PRIF_ATOMIC_INT_KIND), intent(in) :: new
+  integer(c_int), intent(out), optional :: stat
+end subroutine
+
+subroutine prif_atomic_cas_logical_indirect(...)
+  integer(c_int), intent(in) :: image_num
+  integer(c_intptr_t), intent(in) :: atom_remote_ptr
+  logical(PRIF_ATOMIC_LOGICAL_KIND), intent(out) :: old
+  logical(PRIF_ATOMIC_LOGICAL_KIND), intent(in) :: compare
+  logical(PRIF_ATOMIC_LOGICAL_KIND), intent(in) :: new
+  integer(c_int), intent(out), optional :: stat
+end subroutine
 ```
+[Argument descriptions](#common-arguments-in-atomic-memory-operations)
+
 **Further argument descriptions**:
 
-* **`old`**: is set to the initial value of the atomic variable
 * **`compare`**: the value with which to compare the atomic variable
 * **`new`**: the value to assign into the atomic variable, if it is initially equal
   to the `compare` argument
@@ -1933,6 +2486,19 @@ end interface
   the PRIF implementation, and the client is now permitted to modify
   or reclaim them.
 
+* **coindexed object**: A coindexed object is a named scalar coarray variable
+  followed by an image selector (an expression including square brackets).
+
+* **direct location**: A memory location that was allocated using `prif_allocate_coarray`,
+  and can be accessed by remote images using the coarray handle returned from that allocation.
+
+* **indirect location**: A memory location that was not allocated by the same call
+  to `prif_allocate_coarray` that returned a given coarray handle, but which is
+  accessible by remote images through that coarray as an allocatable or pointer
+  component. This memory must have been allocated by either `prif_allocate` or
+  `prif_allocate_coarray`. See [Design Decisions](#design-decisions-and-impact)
+  for additional information.
+
 # Future Work
 
 At present all communication operations are semantically blocking on at least
@@ -1942,6 +2508,12 @@ the future we intend to develop split-phased/asynchronous versions of various
 communication operations to enable more opportunities for static optimization of
 communication.
 
+At present PRIF does not expose a capability for an image to directly access
+memory on another image. We acknowledge that in some cases an image may be
+co-located with the image whose coarray data it wants to access,
+but we don't currently expose this capability to PRIF clients.
+In the future we intend to expose shared-memory bypass for coarray access to PRIF clients.
+
 # Acknowledgments
 
 This research is supported by the Exascale Computing Project (17-SC-20-SC), a
@@ -1954,7 +2526,7 @@ Facility located at Lawrence Berkeley National Laboratory, operated under
 Contract No. DE-AC02-05CH11231
 
 The authors would like to thank Etienne Renault and Jean-Didier Pailleux of
-SiPearl for providing helpful comments and suggestions regarding an earlier
+SiPearl and Jeff Hammond of NVIDIA for providing helpful comments and suggestions regarding an earlier
 revision of this specification.
 
 # Copyright

>From 9fa1eab16410b5c72f8cdef186bdbbed1089c577 Mon Sep 17 00:00:00 2001
From: Brad Richardson <everythingfunctional at protonmail.com>
Date: Thu, 22 Aug 2024 08:23:48 -0500
Subject: [PATCH 4/4] Add PRIF design doc to index

---
 flang/docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/flang/docs/index.md b/flang/docs/index.md
index a6195071408935..6ff714df1af122 100644
--- a/flang/docs/index.md
+++ b/flang/docs/index.md
@@ -70,6 +70,7 @@ on how to get in touch with us and to learn more about the current status.
    OpenMP-semantics
    OptionComparison
    Overview
+   ParallelFortranRuntime
    ParameterizedDerivedTypes
    ParserCombinators
    Parsing



More information about the flang-commits mailing list