Fixes the regex for extracting templates to include templates that
suppress newlines and ignore any conditional flow statements.