Fix option key, note soft-deprecation