Use vars instead of fsi_vars when appropriate.
Add comments and FIXMEs.