Yeah - I think it's safer to leave that alone at present.  A useful cleanup in G+1 maybe?