Mnay fixes for direct and trapping proxies.
Generecised static parameter sized calls to macro.hh