Modernize gic options code style