Fixup expression literal storage structure
Cleanup some top-matter