Update per @danielbachhuber review.