Reworks support for null used in arithmetic. Fixes #159