FIXUP: Simplify port mapping even more.