That's exactly why I objected to the merged "cleanup" pull of port.h. That needs to be reverted.