Dammit.  Fix made, waiting to see if your other issue's actually a problem before I commit.