All right.  I can revert my last commit (which implements option 3) and merge... unless you have any other comments?