Improving the still-ugly index and making annihilation possible.