Swap to 3.1 private statics