Allowing for the 'calc' option to be None.