Incorporated the "useful" PR comments.