Add back in all types, but still none of them are nullable.