Yeah, all this sounds right. Thanks for looking into this!

(Hopefully once I'm back on Monday and my vacation is over, I'll be a little less burnt out and won't make silly errors like this.)