More gcc 47 changes. Speculative.