Address @cathychan feedback for #1299