Commit before timetable.inc code overhaul.