changes to m4/w32 removal, more housework