And don't mention those darn floppies...
Also, alpha and i386 now use a single merged common/sysinst, and arm32 and sparc have a single merged common/xfer.