KJ-4 Removed some redundancy in the elaboration of fields. Experimental commit.