SOme changes to get rid of 'already declared' errors.