Remove unneeded map parameterization in CFI.