Some cleanups of the OK code.
Fecking mercurial and its fecking merges