* Remove @static from the last few places it's left in core. Please don't use this...