Cleaned up 'Opt' to always use static values