Merge Actor.extend, collision fixes, and kill fixes.