Expanded support for math valuers in Options framework.