Allow packages named 'constructor', etc

Not a regression in tool-refactoring.