... and use correct types.