[Ada] Simplify expansion of "and then" in CodePeer mode