BUG: Use None as sentinel value for empty fill gemetry to avoid creating module level globals