Are you sure about that change ? That means your two velocity macros are now inline content.