[WIP] Minor refactorings in PortBindingParser related code