Further refactored Ogre CV stuff.