Fix up CFL a little more.