Refactor tossup and bonus objects to work better without rich text