Missed MAGIC and POISON. A bit more cleanup.