Make refactoring of gpu.cpp a bit easier on us