It looks OK to me. If you can verify that it doesn't change the generated code nontrivially on x86_64, then I think that is sufficient to declare it safe enough for working machines. And grows-up machines are sufficiently broken today in trunk that I'm not concerned about you making them worse.