Added build directives to remove reliance on global rangy variable in core modules