A bit of an NFR and bug.

Several correctness fixes need to be added, in particular with casts, merge and the way the factory duplicates knowledge.

Gentle cleanup that does not breck backwards compatibility