Pretty strange to have a compiler bug like this, but I'm happy with the change. Did you raise it against the toolchain?