Merge "wrap ports into variables to provide common var-style"