More fixes to flatfile serializer.
Merged.
Merge branch 'memory_pragmatic'