Bug 855442 - apply review comments (r=terrence)