Long-term, it is likely better to have normalize quiet SNaN. Can you give that approach a try and see how much short-term fallout there would be? If it's too much of a mess, we can use your current approach instead.
I tried doing this and expected the other places that do the same thing would happen to work out, but I get some APFloatTest failures. It's quite likely I added this to normalize incorrectly though