Revert "Parser update to better understand mixed tags, work on triggers"

This reverts commit 315743afad5e9cbb1e2e0009c8daeed53d45622f.