Major cleanup in ovxlib.