Final tweaks to timeline support for this weekend hack.