Incorporated @thbishop comments.