Summary: an incorrect file was committed with CR 5045147. This commit corrects that error and also applies minor review suggestions.
Reviewed-by: alanb