Type fixeups for strict compile.