Stripping trailing underscores in key names too