Remove more free-variable warnings