Fix explicit markup use to reflect changes to how templates call markup.py (instead of original mechanism)
Fix explicit markup use to reflect changes to how templates call markup.py (instead of original mechanism)

samtaufa/countershape,samtaufa/countershape,cortesi/countershape,mhils/countershape,cortesi/countershape,mhils/countershape