dae482
Remove redundant code and ensure #<id> and @<user> can be used in the initial comment</user></id>