XRENDERING-350: Improve macro transformation speed
* last minute modifications are bad