Clean up extended statics a bit