Make faster.
Some small speedups.