Re-integrate "USE_OPTION_TABLE" code.