Simplify, mostly. Other fixes. Drop Date::Manip for C.