Incorporated @rougier's comments.