[mandatory-inlining] Update for ownership.

This is rebased from many months ago with some small updates for recent work by
Arnold.

Author: gottesmm