more updates on calc - use an empty function as block scope
Authored by: rbri 2020-09-27
Parent: [r723]
Child: [r725]