Remove duplicated code in Top.Make and Top.Make'