pfriedel:
Part of my goal this week is to try to get my local Arduino toolchain back to as close to the distribution defaults as possible again, then re-apply changes in a controlled and documented manner so I know what I've all changed.
Why go through all that trouble? Just use the latest version of WinAVR and be done with it.