Cinnamonape
The changes to the program that you suggest make a lot of sense. It would save everyone time and money and benefit just about everyone, excluding agents. That's probably why it will not happen. Two universal truths are that governments all over the world rarely do what's logical, and common sense isn't so common.