Attempting to standardize as much as possible around `UsingOVM`
as a way to locate OVM specific changes. Also adding comments
that describe the OVM specific changes.