Fix problem with torch management
Fix problem with torch management

Torch management is a little messy, and a defect got injected in there
somewhere. Tidy it up to ensure that torches and the accompanying
graphics are created and destroyed properly.

McMustard/QuickLight