More simplifications to gte.cpp