[Misc] Remove deprecation usage
XRENDERING-219: Impossible to have more that 1000 macros on the same page
* First version, not perfect but should be better than before