Remove / make const a few more statics.