Remarshal and rename flags
braces everywhere