Improved analytics for #36.