Backport from Saxon 9.3

Simplified AVT expressions was not an atomic expression.