Merge kill_list changes.

Awesome job! Go ahead and merge this back into master.