Keren found a bug in MHD. It is fixed here and some test code added to check for it. Various checks were added in decorator-related code in tracking down the bug.