Pass Option<T> for optional primitive arguments without a default value (fixes #1813).