Tiny refactor so that GOS.x is only called from one place

Change-Id: I32e965b3f40db90bdb85560104aeb26a29729f37