get rid of superfluous serial() arg to {XT,XD}:policy_changed
cosmetic: make callback function def order match usage
Merge bug25495