[[ UnicodeFileFormat ]] Further updates to unicodify file format for 7.0.