Some minor cleaning up.
Addressed a potential memory access issue in our plugin framework.