Updating: improving ccomp-emit functions.