Bug 1025055 - Incorporating review feedback.