A few changes lost in the merge in of t-paul's latest.