Changed __r to ___, now also generates slightly tighter template code (no more #__r + 1).