Good idea;  I'll update this post-merge.