Comment 1 for bug 1245564

We should break each of these points into separate bugs (since you can list them independently). Hopefully that will make the changes smaller, easier to digest, and faster to get approved.