Add more analytics events (bug 1095499)

Actually this looks like it will blow up.