OTOH the way it is now is used in the file already .. think we should leave that for consistency.