Bug 8268 follow-up: incorporate QA comments