Cleanup some bad design decisions from the earliest days of the project...
(in no way does this affect performance or sound, just code...)