I recommend printing some documentation from the government website wherever it says that $x is allowed or $y is deprecated. It won't stop some officious c*nt at the border, but when they call their supervisor, the latter might be able to recognise enough of the words to look it up and figure it out.
