Doh! ... How did I manage to miss that? I guess I was too focused on restructuring the plugin. I'll fix this next Tuesday.