Eliminate OPP, plus cleanup. Fixes #6