Fixed-ish the pre/post collision event callbacks (with probably the ugliest code ever)