Implement review feedback for #980.