Use map syntax to clean up null handling in toJson functions (#1443)

Use map syntax to clean up null handling in toJson functions (#1443) #1137