Oh this is much much better!  This cleanup patch is great.