Merge "Use trivial types to avoid calls to new for globals"