[1] and [2] are incorrect. The parameters to those templates should not contain markup.
Ouch. Thanks for your report. I have reverted these edits.
