#537 - Velocity macros for inner templates + indentation