Get rid of confusing self references to statics.