Accept "-" for instead of +null as nil too.
Cleanup