Move some static data out.
Cleanups.