@Pavel: Yep, that seems like the right thing to do ;)