Integrate feedback from @jsha in #58