For single shot rifles, I think that the current system is over-bearing & over-protective. These are not wpns of war, they are tgt rifles. However, I would agree that the L98 needs greater safety emphasis. In the good old days, I was trained on the No 8 by a cadet cpl who already had a marksman badge. For the .303, it moved up to a cadet sgt! We all survived.....
The drills are inconsistent (carry rifle bolt open or bolt closed, breech flag / no breech flag?), the L144 will soon suffer from damaged firing pins due to firing off the action on an empty chamber, & the air rifle UNLOAD followed by inspection is a pointless exercise - after the UNLOAD (which includes firing off the action), there can't be anything in the breech / barrel, as the huge blast of air just cleared it!
It would aid trg immensely if the drills were simplified (as per NRA / NSRA parameters) & then allow local trg (heresy, heresy!). It is because of the rigidity of the drills that there are issues, tied in with the difficulty in getting a tester (who also has to keep currency, sometimes just as difficult to coordinate).
Until SASC / HQAC flight it out, it's not going to happen though.