Implement feedback on r224172 in PR21899

Based on suggestions from Kaelyn.