Guess I could run a round of Coverity just to make sure it isn't already happening..