I think I saw some TODOs in other places, but it may be instructive to mark these with some identifier. For example, when I did the Rails 3.0 to 3.2 bridge, I marked all todos as `TODO RAILS32` so that when I did a `rake notes:todo`  it was very obvious which ones I needed to address for that story.