This is a followup to PR #6780 that implements some discussed
language changes.
Signed-off-by: Matt Farina <matt@mattfarina.com>