I've decided to do it your way (__PACKAGE__). I also realized from your post that I was doing the one-semicolon thing wrong anyway. =D

Thanks again,

-SM