Incorporated comments from JohnB.