This diff is a pure refactor. In the next diff I extend getJSON a bit, and it helps readability a little bit to extract it into its own function beforehand.

Depends on D4098

I tested this in combination with the next diffs, which makes sure importJSON still works correctly