Address David Alexander's comments
[tracking bug 25389]