Refactoring so we don't have gaps in variable numbering, because I'm OCD.