Andrew, I am using the Choice module for the tutorial at http://docs.moodle.org/en/Development:Backup_1.9_conversion_for_developers Therefore I think it would make sense to re-assign this issue to me as I will work on the Choice module anyway. Is that ok with you?
Sure. Its all yours.
Included in David's pre-integration branch