Consistently use gb_Helper_optional

Change-Id: I73108da58cfb1243b699678661a628643fa170a2