considerably shrinking recent struct map definitions (only indentation changes)