Yes, that's a great idea. I'll add a new commit to address this and the other new comments.