@nikivazou can you split this into a separate function so these equations don't clutter renameTyVars?