Remove hacks around issues in local_data

These compiler bugs have since been fixed (one less layer of indirection)