Attached are two diffs, my token patch updated to 4.4, and a bloat patch ;) which provides everything you wanted.
cls
This archive was generated by hypermail 2.2.0 : Mon Sep 12 2011 - 00:00:08 CEST