Thanks.  It's nice to see the code get smaller and simpler.  I rebased 
that patch again and tweaked the commit message (attachment 1), and 
followed up with a minor fixup patch to remove a now-unused macro and 
reindent to fit into 80 columns (attachment 2.)