Tidied up Port.hpp/cpp macros.