Incorporated review comments from Dave Thaler.