Improved calc-effect; now just accepts results map.