Change history allocation from list to dict

This change was suggested in review of the original.  It's a little
clearer to keep the values in a dict so you can tell a priori what is
being used.

Change-Id: I26716953d74342453bb934bba6d90860f32976cb