Removed a 'clever' hack from FinalVar that probably wouldn't work correctly.