A little cleanup - moved extensions into JsonPropertyExtensions