Quick hack to make arithmetic work in immediate mode
Remove/update the tests that depended on the deferred arithmetic operations