Cleanups, comments, and fix to URL::PortType - use Optional - and fix to be uint16_t