Changes for persistent question numbering.