Belatedly discovered that removing trailing whitespace with s/\s*$// instead of s/\s+$// was costing a full second of runtime every time the texlive.tlpdb file was read (about 50% of the read time). Furthermore, we apparently don't need to remove trailing whitespace at all (more savings). Unless I'm missing something obvious, this should be a nice fix for the 2011 release :).