Correctly namespace ports under switches

- Fix a bug where you still couldn't make two ports with the same name, even
  on differnet switches
- Correctly search for ports (three times)

As a side effect, this removes three of the lines of code that were not
covered.