Eliminate unnecessary conversions of option keys

Change-Id: I5f3b267cec0357fe1a1c1a13bafdf3c1f3b6d426