Clean up the Yardstick options code, as suggested by @snusnu