Make some more subs constant that can be for speed.