Jeff -- thanks for your hard work on this. John -- thanks for the review. If you'd like to put this in a for-jason branch, I'll get to merging it soon. Jason