Keyval arguments of \includepdf are getting expanded. Expanding args of addtotoc and addtolist more graciously.