Guard against redefining packages
Clarified comment