Try to eliminate OSHandle interior pointer use.

Doesn't seem to break anything, at least. Testing needed.