Compatibility with commented out scripts

With help from @mkutyba and report by @mzeis we have resolved an issue where scripts that were commented out were being moved to the footer without their comments. This results in JS becoming functional that shouldn't have been.

This release also reduces from two observers to one with the same functionality.