Re #386: Fix dynamic tag markup.