Fix some logic and speed up killing of druids significantly.