Revision, followed suggestions in comments.