Haven't worked on this in forever, but I think this is a useful change.