Updates from davecheney's review.