The i386 - unknown default change is a fun factor in an otherwise boring refactoring :)