Minor rewrite.