Convert all remaining operations to use cgtypes