Beginning further vanilla integration

I still can't decide whether to keep modified vanilla events in a
separate file or not. I lean towards separate just because it'll make
the included vanilla files cleaner and easier to update with future
patches.