Remove the Options query functions and just access our Options directly.