Preparing for new version of CForm.