Addressing review comment by @nickhale.