White space cleanups and support conversion of hex for options.