Cleaned up TwoTerminal/PassiveTwoTerminal hierarchy