[SR-Users] #!endif and SUBSCRIBE issues 3.0.x

[Jeremya]

I've discovered - after quite a while - that #!endif doesn't work if
there is extra text on the line

#!endif 

works

#!endif   # someblock

doesn't work.

Could this be addressed in code or at least noted in documentation?

I also have the case of SUBSCRIBE where it is a later (re)SUBSCRIBE
after an initial SUBSCRIBE.
This has a to-tag. This is not handled by the default script. Could the
default script be altered to handle SUBSCRIBE with to-tag please?

Thanks

Jeremy