Move almost everything from gen{day,week} into gencommon.