Restore support for @option, albeit a little more strictly.
Fix the repl...  maybe?