This is better, gut gcc still doesn't like __builtin_unreachable() and errors out.
Not sure why we didn't get this problem before.

I also cleaned up a multiline macro to make it more readable