Code: Respect JsonProperty continued

Taken some fighting to get it to play nice with other changes that
happened in the files in the mean time.  Can't amend the previous
commit, since there have been other fixes since