When clearing out symbols for a new annotation processing round, preserve types when possible. Reviewed-by: vromero
Reviewed-by: darcy, ihse