Fix support for Velocity and Soy comments

So far, when trying to support both types of comments, if one was read
it was immediately overwritten by a new assignment which could be empty.

Change-Id: If47185e9bf66468b9fcc25faff8c460c2d2c4c7a