Just to follow up, basically no matter which way we do this we get a warning or stupid extra output, so the duplication has to stay for now.