Actually fix this aliasing violation while I'm at it.