Ensure strchr cannot inadvertently be passed a NULL and also remove
misleading code comment.