Solve a couple more coverage issues; tighten.
Add unit tests for #59.
Fix template parsing when comments are inside the name (fixes #59).