Get ready to kill skip code. Using a quiz-end question processor.
Normalize usage of rid and result_id (use result_id, as that is in the database).