Misc cleanup in assocication with merging back changes to WinUAE