A few more changes based on discussion with @lazd.