This PR merges the two existing validation functions, expected to be run in a specific order, into a single validation function. The requirements that caused the split no longer exist.
For an easier review:
The first commit, 857d579cce7d8d4c8c02078e4ce2ccd05eb825d2, contains the functional changes.
The second commit, c5f5a52f54227f0eb789bd5400156b5bc0a0fddf, moves code around without functional changes.
This PR merges the two existing validation functions, expected to be run in a specific order, into a single validation function. The requirements that caused the split no longer exist.
For an easier review:
857d579cce7d8d4c8c02078e4ce2ccd05eb825d2, contains the functional changes.c5f5a52f54227f0eb789bd5400156b5bc0a0fddf, moves code around without functional changes.skip-changelog