Complete term conversion to CBPV (with hack for constants)