Adding static-only switch to pickling