Port over all non-param types