XPATH: Improved message flow checking.