If there are no other comments in this PR, I'll make the changes and push them in.