@paulcbetts thanks for the review! I added a commit that tries to stress this last point you made.