Moving TypeConventions and Returns to be separate