Minor tidying and variable renames
Pretty sure this is unnecessary.

Will mess up indexing of local vars in CodeGenerator.fs
Index local vars and pass

Not declaring yet