I noticed that to while going thru this ticket. Perhaps a cleanup ticket is in order?