Fix accidentally broken things after removing unused variables