Still fighting to solve #302 and #304...

I've got a problem with EventHandler and type erasure, I think. I
renamed the problematic method. Hopes it help.