Added some more logic relating to comment IDs.