Address David Alexander's comments and review
[tracking bug 25389]