Fix some type-punned warnings
Created attachment 4815 [details] backport to 3-3-test
Karolin, one more for 3-3-test.
Pushed, closing out bug report. Thanks!