Address some review comments on bug 133408