* NullFactories compiles,
* Some structure fixes.