Aaagh more Quiz 7.x-5.x changes.