I don't think this is too much of a problem... Can't see a particularly obvious way around it atm.  I think, check it in, if something obvious comes up, refactor?