Fix bug in CFL condition.
Move some fsi-specific vabiables to fsi_vars.