Adding static-only switch to pickling

Yeah, that's what I thought. I left it there though because I was following what you guys did in async – I was wondering why this stuff wasn't in test for you...