Refactoring to a single helper method (expandIfAll) which does the only Fields.ALL check. I think this is the joint.