Switch comments to correct types