Refactor the refactor to make the repeated subfeild logic more explicit