Remove a couple cases of dangerous aliasing, causing crashes. #1257